diff --git a/gcc/cobol/ChangeLog b/gcc/cobol/ChangeLog
index 7a950fe24df8fa023295f0d3eabdb4d02a323667..51874c6e28777802b3bbfd1dbbacb227a3c97a0f 100644
--- a/gcc/cobol/ChangeLog
+++ b/gcc/cobol/ChangeLog
@@ -17,5 +17,6 @@
 	trimmed .h files in gengen.cc
 	trimmed .h files in genmath.cc
 	trimmed .h files in genutil.cc
+	trimmed .h files in structs.cc
 
 	* Eliminate vestigial unused code from the PERFORM-PROC-AS_CALL experiment
diff --git a/gcc/cobol/structs.cc b/gcc/cobol/structs.cc
index e00900fab40582c654e28fb1d9ef1979b90f4588..b90a2f9f1098d31c3378534caa03d6f8370acf06 100644
--- a/gcc/cobol/structs.cc
+++ b/gcc/cobol/structs.cc
@@ -52,34 +52,11 @@
 
         */
 
-#include <assert.h>
-#include <assert.h>
-#include <assert.h>
-#include <assert.h>
-#include <err.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <vector>
-#include <string>
-#include <unordered_map>
-
-#include "config.h"
-#include "system.h"
+#include "cobol-system.h"
 #include "coretypes.h"
-#include "target.h"
 #include "tree.h"
-#include "tree-iterator.h"
-#include "stringpool.h"
-#include "cgraph.h"
-#include "gimplify.h"
-
 #define HOWEVER_GCC_DEFINES_TREE 1
-#include "genapi.h"
 #include "gengen.h"
-#include "symbols.h"
-#include "structs.h"
 
 tree
 var_decl_node_p_of( cbl_field_t *var )