diff --git a/gcc/cobol/ChangeLog b/gcc/cobol/ChangeLog
index 5af615fa26c6aa1f52fc17aa67139416fb5ec73d..9510b3abb8d73b75addc4f1be2bd201c7a98b616 100644
--- a/gcc/cobol/ChangeLog
+++ b/gcc/cobol/ChangeLog
@@ -25,8 +25,9 @@
 	convert cdf-copy.cc to cbl_warning
 	convert cdf.y to cbl_warning
 	convert parse.y CDF display to cbl_message
-	convert lexio.cc CDF display to cbl_warning
-	convert cobol1.cc CDF display to cbl_warning
-    
+	convert lexio.cc to cbl_warning
+	convert cobol1.cc to cbl_warning
+	convert copybook.h to cbl_warning
+
 
 
diff --git a/gcc/cobol/cdf-copy.cc b/gcc/cobol/cdf-copy.cc
index 5187e940f7822ee399e4f238fe0ef97a99e47360..41a5193fde45d3926366fc5dc3d9f0a668a7b85d 100644
--- a/gcc/cobol/cdf-copy.cc
+++ b/gcc/cobol/cdf-copy.cc
@@ -35,8 +35,8 @@
 // We regret any confusion engendered.
 
 #include "lexio.h"
-#include "copybook.h"
 #include "util.h"
+#include "copybook.h"
 
 #include <deque>
 
diff --git a/gcc/cobol/cdf.y b/gcc/cobol/cdf.y
index 8c9239d13716fd41c694c84319eed7f0734e8ade..d50c36c30075b71308d11147a13949491149489e 100644
--- a/gcc/cobol/cdf.y
+++ b/gcc/cobol/cdf.y
@@ -28,12 +28,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 %{
+#include "util.h"
 #include "copybook.h"
 #include "ec.h"
 #include "symbols.h"
 #include "exceptl.h"
 #include "exceptg.h"
-#include "util.h"
 
 #include <ctype.h>
 #include <fcntl.h>
diff --git a/gcc/cobol/copybook.h b/gcc/cobol/copybook.h
index 1077c0363eb1a3fac1ed21180f0f25cc1a4b4962..1ba284443b12995680497cd49dcccd720ed57949 100644
--- a/gcc/cobol/copybook.h
+++ b/gcc/cobol/copybook.h
@@ -159,7 +159,7 @@ class copybook_t {
       if( !output ) output = input; // keep original unmodified
     }
     if( false && output != path ) {
-      warnx("using copybook file '%s' from environment variable ''%s",
+      cbl_warning("using copybook file '%s' from environment variable ''%s",
             output, input);
     }
     return strdup(output);
@@ -195,7 +195,7 @@ class copybook_t {
 
     for( auto dir : directories ) {
       if( false ) {
-        warnx("copybook_t::open( '%s' OF '%s' %s",
+        cbl_warning("copybook_t::open( '%s' OF '%s' %s",
               book.source, dir, book.literally.source? ", literally" : "" );
       }
       if( (fd = book.open_file(dir, book.literally.source)) != -1 ) break;
diff --git a/gcc/cobol/lexio.cc b/gcc/cobol/lexio.cc
index fa1649adef6c3ca3321d80bf45662169a76c4917..682c1c18dd498b9a4c9b7c42577b52c0289ca669 100644
--- a/gcc/cobol/lexio.cc
+++ b/gcc/cobol/lexio.cc
@@ -103,6 +103,7 @@ bool set_debug( bool tf ) { return debug_mode = tf && is_fixed_format(); }
 
 static bool nonblank( const char ch ) { return !isblank(ch); }
 
+#include "util.h"
 #include "copybook.h"
 
 #include <string>
diff --git a/gcc/cobol/parse_ante.h b/gcc/cobol/parse_ante.h
index 28bb2916f8275314081704394eb4adbbd390d34a..814221bb2a92be29775c6ab8f1d376e0d25b680a 100644
--- a/gcc/cobol/parse_ante.h
+++ b/gcc/cobol/parse_ante.h
@@ -29,6 +29,7 @@
  */
 
 #include "genapi.h"
+#include "util.h"
 #include "copybook.h"
 #include "io.h"
 #include "ec.h"
diff --git a/gcc/cobol/scan_ante.h b/gcc/cobol/scan_ante.h
index 30351e403215f2534cbe1be7e3aac38cebc32c20..07fe05731b2b8e36139ed6a68a66069ac5dea345 100644
--- a/gcc/cobol/scan_ante.h
+++ b/gcc/cobol/scan_ante.h
@@ -41,6 +41,7 @@
 #include "parse.h"
 #include "cdf.h"
 #include "symbols.h"
+#include "util.h"
 #include "copybook.h"
 #include "cbldiag.h"