From f49a0c4d8c42d29371542f2acc94242615358cef Mon Sep 17 00:00:00 2001
From: Bob Dubner <rdubner@symas.com>
Date: Tue, 21 Jan 2025 00:41:24 -0500
Subject: [PATCH] Remove local #include from copybook.h

---
 gcc/cobol/cdf-copy.cc | 1 +
 gcc/cobol/copybook.h  | 2 +-
 gcc/cobol/genapi.cc   | 1 -
 gcc/cobol/gengen.cc   | 1 -
 gcc/cobol/lexio.cc    | 1 +
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcc/cobol/cdf-copy.cc b/gcc/cobol/cdf-copy.cc
index a98d789f8eed..eed8829ab60c 100644
--- a/gcc/cobol/cdf-copy.cc
+++ b/gcc/cobol/cdf-copy.cc
@@ -36,6 +36,7 @@
 
 #include "cobol-system.h"
 #include "cbldiag.h"
+#include "util.h"
 #include "copybook.h"
 
 #include <glob.h>
diff --git a/gcc/cobol/copybook.h b/gcc/cobol/copybook.h
index a0eeef21a493..7f1a30fbacf0 100644
--- a/gcc/cobol/copybook.h
+++ b/gcc/cobol/copybook.h
@@ -31,7 +31,7 @@
 #ifndef _COPYBOOK_H
 #define _COPYBOOK_H
 
-#include "util.h"
+// #include "util.h"
 
 FILE * copy_mode_start();
 
diff --git a/gcc/cobol/genapi.cc b/gcc/cobol/genapi.cc
index da69de702f8d..5caa3e979f5b 100644
--- a/gcc/cobol/genapi.cc
+++ b/gcc/cobol/genapi.cc
@@ -52,7 +52,6 @@
 #include "valconv.h"
 #include "cbldiag.h"
 #include "show_parse.h"
-#include "util.h"
 
 extern int yylineno;
 
diff --git a/gcc/cobol/gengen.cc b/gcc/cobol/gengen.cc
index 680b38e5ab61..270856eeb49c 100644
--- a/gcc/cobol/gengen.cc
+++ b/gcc/cobol/gengen.cc
@@ -101,7 +101,6 @@
 #include "cbldiag.h"
 #include "symbols.h"
 #include "gengen.h"
-#include "util.h"
 
 // We are limiting the programmer to functions with 512 or fewer arguments.
 // Don't like it?  Cry me a river.
diff --git a/gcc/cobol/lexio.cc b/gcc/cobol/lexio.cc
index 1c4bc9d102a1..4b948e5491a5 100644
--- a/gcc/cobol/lexio.cc
+++ b/gcc/cobol/lexio.cc
@@ -33,6 +33,7 @@
 #include <ext/stdio_filebuf.h>
 #include "cobol-system.h"
 #include "cbldiag.h"
+#include "util.h"
 #include "copybook.h"
 #include "lexio.h"
 
-- 
GitLab