diff --git a/libga68/ga68-alloc.c b/libga68/ga68-alloc.c
index 1cf922eb2115..5e9f7c2b9203 100644
--- a/libga68/ga68-alloc.c
+++ b/libga68/ga68-alloc.c
@@ -20,9 +20,10 @@
    COPYING3 and COPYING.RUNTIME respectively.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include "ga68.h"
+
 #include <stdlib.h>
 
-#include "ga68.h"
 
 /* Heap allocation routines.  */
 
diff --git a/libga68/ga68-error.c b/libga68/ga68-error.c
index 28f71659645f..c826317badec 100644
--- a/libga68/ga68-error.c
+++ b/libga68/ga68-error.c
@@ -20,10 +20,11 @@
    COPYING3 and COPYING.RUNTIME respectively.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include "ga68.h"
+
 #include <stdio.h>
 #include <stdlib.h> /* For abort.  */
 
-#include "ga68.h"
 
 /* Run-time error handling.
 
diff --git a/libga68/ga68-standenv.c b/libga68/ga68-standenv.c
index 2c1b7979af10..4a5dc25200aa 100644
--- a/libga68/ga68-standenv.c
+++ b/libga68/ga68-standenv.c
@@ -20,9 +20,10 @@
    COPYING3 and COPYING.RUNTIME respectively.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include "ga68.h"
+
 #include <stdlib.h> /* For rand.  */
 
-#include "ga68.h"
 
 /* Implementation of the standard prelude `random' function.  */
 
diff --git a/libga68/ga68-unistr.c b/libga68/ga68-unistr.c
index 1b6f46afee39..85ddada4f2c4 100644
--- a/libga68/ga68-unistr.c
+++ b/libga68/ga68-unistr.c
@@ -23,13 +23,14 @@
 /* The code in this file has been copied from the unistr gnulib module, written
    by Bruno Haible, and adapted to support strides.  */
 
+#include "ga68.h"
+
 #include <stddef.h> /* For ptrdiff_t */
 #include <stdlib.h>
 #include <stdint.h>
 #include <errno.h>
 #include <string.h>
 
-#include "ga68.h"
 
 /* CMP (n1, n2) performs a three-valued comparison on n1 vs. n2, where
    n1 and n2 are expressions without side effects, that evaluate to real