From 0434e72382eb9a2df91137e2508c8faca5c59906 Mon Sep 17 00:00:00 2001
From: Bob Dubner <rdubner@symas.com>
Date: Tue, 21 Jan 2025 01:05:33 -0500
Subject: [PATCH] Remove local #include from libgcobol.h

---
 gcc/cobol/charmaps-copy.cc | 2 ++
 gcc/cobol/genapi.cc        | 2 ++
 gcc/cobol/genmath.cc       | 2 ++
 gcc/cobol/genutil.cc       | 2 ++
 libgcobol/charmaps.cc      | 2 ++
 libgcobol/constants.cc     | 2 ++
 libgcobol/gcobolio.h       | 1 +
 libgcobol/gfileio.cc       | 2 ++
 libgcobol/gmath.cc         | 2 ++
 libgcobol/intrinsic.cc     | 2 ++
 libgcobol/libgcobol.cc     | 2 ++
 libgcobol/libgcobol.h      | 5 -----
 libgcobol/valconv.cc       | 2 ++
 13 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/gcc/cobol/charmaps-copy.cc b/gcc/cobol/charmaps-copy.cc
index bac76fcd06b6..44e943c1b162 100644
--- a/gcc/cobol/charmaps-copy.cc
+++ b/gcc/cobol/charmaps-copy.cc
@@ -44,6 +44,8 @@
 #include <locale.h>
 #include <iconv.h>
 
+#include "gcobolio.h"
+#include "ec.h"
 #include "libgcobol.h"
 #include "charmaps.h"
 #include "valconv.h"
diff --git a/gcc/cobol/genapi.cc b/gcc/cobol/genapi.cc
index 5caa3e979f5b..ab563de189af 100644
--- a/gcc/cobol/genapi.cc
+++ b/gcc/cobol/genapi.cc
@@ -47,6 +47,8 @@
 #include "genapi.h"
 #include "genmath.h"
 #include "structs.h"
+#include "gcobolio.h"
+#include "ec.h"
 #include "libgcobol.h"
 #include "charmaps.h"
 #include "valconv.h"
diff --git a/gcc/cobol/genmath.cc b/gcc/cobol/genmath.cc
index a082e372aa73..cb43b1284d16 100644
--- a/gcc/cobol/genmath.cc
+++ b/gcc/cobol/genmath.cc
@@ -34,6 +34,8 @@
 #include "genutil.h"
 #include "gengen.h"
 #include "structs.h"
+#include "gcobolio.h"
+#include "ec.h"
 #include "libgcobol.h"
 #include "cbldiag.h"
 #include "show_parse.h"
diff --git a/gcc/cobol/genutil.cc b/gcc/cobol/genutil.cc
index a7a1ef64f638..e439ab25b352 100644
--- a/gcc/cobol/genutil.cc
+++ b/gcc/cobol/genutil.cc
@@ -38,6 +38,8 @@
 #include "gengen.h"
 #include "genutil.h"
 #include "structs.h"
+#include "gcobolio.h"
+#include "ec.h"
 #include "libgcobol.h"
 #include "charmaps.h"
 #include "cbldiag.h"
diff --git a/libgcobol/charmaps.cc b/libgcobol/charmaps.cc
index 4d18c133060b..1a9815788151 100644
--- a/libgcobol/charmaps.cc
+++ b/libgcobol/charmaps.cc
@@ -44,6 +44,8 @@
 #include <locale.h>
 #include <iconv.h>
 
+#include "gcobolio.h"
+#include "ec.h"
 #include "libgcobol.h"
 #include "charmaps.h"
 #include "valconv.h"
diff --git a/libgcobol/constants.cc b/libgcobol/constants.cc
index b33b28c34a64..06f625a0f542 100644
--- a/libgcobol/constants.cc
+++ b/libgcobol/constants.cc
@@ -40,6 +40,8 @@
 #include <algorithm>
 #include <unordered_map>
 
+#include "gcobolio.h"
+#include "ec.h"
 #include "libgcobol.h"
 #include "gfileio.h"
 #include "charmaps.h"
diff --git a/libgcobol/gcobolio.h b/libgcobol/gcobolio.h
index 3b5d51922128..e6c046fcbf6d 100644
--- a/libgcobol/gcobolio.h
+++ b/libgcobol/gcobolio.h
@@ -33,6 +33,7 @@
 #include "common-defs.h"
 #include "io.h"
 
+#include <stdio.h>
 #include <map>
 #include <unordered_map>
 #include <vector>
diff --git a/libgcobol/gfileio.cc b/libgcobol/gfileio.cc
index 6d02fe935468..9f9bd275dfcd 100644
--- a/libgcobol/gfileio.cc
+++ b/libgcobol/gfileio.cc
@@ -40,6 +40,8 @@
 #include <unistd.h>
 #include <algorithm>
 
+#include "gcobolio.h"
+#include "ec.h"
 #include "libgcobol.h"
 #include "gfileio.h"
 #include "charmaps.h"
diff --git a/libgcobol/gmath.cc b/libgcobol/gmath.cc
index db76ae1c7739..942bfbe63dc5 100644
--- a/libgcobol/gmath.cc
+++ b/libgcobol/gmath.cc
@@ -39,6 +39,8 @@
 #include <unistd.h>
 #include <algorithm>
 
+#include "gcobolio.h"
+#include "ec.h"
 #include "libgcobol.h"
 #include "common-defs.h"
 #include "gmath.h"
diff --git a/libgcobol/intrinsic.cc b/libgcobol/intrinsic.cc
index 1372897faf31..f9f849319cb0 100644
--- a/libgcobol/intrinsic.cc
+++ b/libgcobol/intrinsic.cc
@@ -44,6 +44,8 @@
 #include <langinfo.h>
 #include <string.h>
 
+#include "gcobolio.h"
+#include "ec.h"
 #include "libgcobol.h"
 #include "charmaps.h"
 
diff --git a/libgcobol/libgcobol.cc b/libgcobol/libgcobol.cc
index f267c45fe39f..f9986cc042de 100644
--- a/libgcobol/libgcobol.cc
+++ b/libgcobol/libgcobol.cc
@@ -49,6 +49,8 @@
 #include <dirent.h>
 #include <sys/resource.h>
 
+#include "gcobolio.h"
+#include "ec.h"
 #include "libgcobol.h"
 #include "gfileio.h"
 #include "charmaps.h"
diff --git a/libgcobol/libgcobol.h b/libgcobol/libgcobol.h
index 0e0e289ecbb1..a3461762c802 100644
--- a/libgcobol/libgcobol.h
+++ b/libgcobol/libgcobol.h
@@ -36,11 +36,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include "gcobolio.h"
-
- #include "ec.h"
-
-
 #define MIN_FIELD_BLOCK_SIZE (16)
 
 // RUNTIME structures *must* match the ones created in structs.c and initialized
diff --git a/libgcobol/valconv.cc b/libgcobol/valconv.cc
index 4eff27d83c46..82fc6cf07789 100644
--- a/libgcobol/valconv.cc
+++ b/libgcobol/valconv.cc
@@ -43,6 +43,8 @@
 #include <unordered_map>
 #include <set>
 
+#include "gcobolio.h"
+#include "ec.h"
 #include "libgcobol.h"
 #include "gfileio.h"
 #include "charmaps.h"
-- 
GitLab