diff --git a/gcc/cobol/charmaps-copy.cc b/gcc/cobol/charmaps-copy.cc
index 44e943c1b16222df3c6bf481446f63db9cfa5e6b..b05791bcd2454f5db56bdc1240b50dd6b3a94c5c 100644
--- a/gcc/cobol/charmaps-copy.cc
+++ b/gcc/cobol/charmaps-copy.cc
@@ -44,8 +44,10 @@
 #include <locale.h>
 #include <iconv.h>
 
-#include "gcobolio.h"
 #include "ec.h"
+#include "common-defs.h"
+#include "io.h"
+#include "gcobolio.h"
 #include "libgcobol.h"
 #include "charmaps.h"
 #include "valconv.h"
diff --git a/gcc/cobol/genmath.cc b/gcc/cobol/genmath.cc
index cb43b1284d1640f056617e853f833c8c77672289..bb0fc57878c586d9b2fd08d8ccf52ef0bdc745d8 100644
--- a/gcc/cobol/genmath.cc
+++ b/gcc/cobol/genmath.cc
@@ -34,8 +34,11 @@
 #include "genutil.h"
 #include "gengen.h"
 #include "structs.h"
-#include "gcobolio.h"
 #include "ec.h"
+#include "common-defs.h"
+#include "io.h"
+#include "gcobolio.h"
+#include "symbols.h"
 #include "libgcobol.h"
 #include "cbldiag.h"
 #include "show_parse.h"
diff --git a/libgcobol/charmaps.cc b/libgcobol/charmaps.cc
index 1a981578815185f0fcd91af994f32224cc6ca8e1..5de8b8758ef0224f7c4497ef39ee1ea79bd541fd 100644
--- a/libgcobol/charmaps.cc
+++ b/libgcobol/charmaps.cc
@@ -44,8 +44,10 @@
 #include <locale.h>
 #include <iconv.h>
 
-#include "gcobolio.h"
 #include "ec.h"
+#include "common-defs.h"
+#include "io.h"
+#include "gcobolio.h"
 #include "libgcobol.h"
 #include "charmaps.h"
 #include "valconv.h"
diff --git a/libgcobol/gcobolio.h b/libgcobol/gcobolio.h
index 46e9ef1e5cecf0b0ac2be65e0627952f9c80c71a..7d6ca6adb2d967a868afe435ae778753699bd1dc 100644
--- a/libgcobol/gcobolio.h
+++ b/libgcobol/gcobolio.h
@@ -30,10 +30,6 @@
 #ifndef GCOBOLIO_H_
 #define GCOBOLIO_H_
 
-#include "ec.h"
-#include "common-defs.h"
-#include "io.h"
-
 #include <stdio.h>
 #include <map>
 #include <unordered_map>
diff --git a/libgcobol/gmath.cc b/libgcobol/gmath.cc
index 942bfbe63dc5ccdbf0f74ba3dfd9a2af3c6c5bdb..de8fdefa11f91cd6d7bf3cf7a2c8ff896e75ad92 100644
--- a/libgcobol/gmath.cc
+++ b/libgcobol/gmath.cc
@@ -39,8 +39,10 @@
 #include <unistd.h>
 #include <algorithm>
 
-#include "gcobolio.h"
 #include "ec.h"
+#include "common-defs.h"
+#include "io.h"
+#include "gcobolio.h"
 #include "libgcobol.h"
 #include "common-defs.h"
 #include "gmath.h"
diff --git a/libgcobol/intrinsic.cc b/libgcobol/intrinsic.cc
index f9f849319cb05f1be515689ebea6e112102593dc..3a89d18eacc23fd752c9e637dc7332245078b6a1 100644
--- a/libgcobol/intrinsic.cc
+++ b/libgcobol/intrinsic.cc
@@ -44,8 +44,10 @@
 #include <langinfo.h>
 #include <string.h>
 
-#include "gcobolio.h"
 #include "ec.h"
+#include "common-defs.h"
+#include "io.h"
+#include "gcobolio.h"
 #include "libgcobol.h"
 #include "charmaps.h"
 
diff --git a/libgcobol/libgcobol.cc b/libgcobol/libgcobol.cc
index 06e2e6b8b10e1fe682d2ae690149d5bc7822a209..9d0c92557acc7b3b1c24a416f4d2959994df8b28 100644
--- a/libgcobol/libgcobol.cc
+++ b/libgcobol/libgcobol.cc
@@ -49,8 +49,10 @@
 #include <dirent.h>
 #include <sys/resource.h>
 
-#include "gcobolio.h"
 #include "ec.h"
+#include "common-defs.h"
+#include "io.h"
+#include "gcobolio.h"
 #include "libgcobol.h"
 #include "gfileio.h"
 #include "charmaps.h"
diff --git a/libgcobol/valconv.cc b/libgcobol/valconv.cc
index 82fc6cf07789084dae4c59db383eecaa5536cc9d..369f01b4f8cf75b6fcfd6eaf12891e8af00829c1 100644
--- a/libgcobol/valconv.cc
+++ b/libgcobol/valconv.cc
@@ -43,8 +43,10 @@
 #include <unordered_map>
 #include <set>
 
-#include "gcobolio.h"
 #include "ec.h"
+#include "common-defs.h"
+#include "io.h"
+#include "gcobolio.h"
 #include "libgcobol.h"
 #include "gfileio.h"
 #include "charmaps.h"