flags.h: Don't include flag-types.h or options.h.

2015-07-09  Andrew MacLeod  <amacleod@redhat.com>

	* flags.h: Don't include flag-types.h or options.h.
	* opts-common.c: Adjust includes.
	* opts-global.c: Likewise.
	* common/config/epiphany/epiphany-common.c: Likewise.

c

	* c-array-notation.c: Adjust includes for flags.h changes.
	* c-objc-common.c: Likewise.

c-family

	* c-common.h: Adjust includes for flags.h changes.
	* stub-objc.c: Likewise.

fortran

	* arith.c: Adjust includes for flags.h changes.
	* array.c: Likewise.
	* check.c: Likewise.
	* decl.c: Likewise.
	* error.c: Likewise.
	* expr.c: Likewise.
	* frontend-passes.c: Likewise.
	* interface.c: Likewise.
	* intrinsic.c: Likewise.
	* io.c: Likewise.
	* match.c: Likewise.
	* openmp.c: Likewise.
	* parse.c: Likewise.
	* primary.c: Likewise.
	* resolve.c: Likewise.
	* scanner.c: Likewise.
	* simplify.c: Likewise.
	* symbol.c: Likewise.
	* target-memory.c: Likewise.

jit
	* dummy-frontend.c: Adjust includes for flags.h changes.
	* jit-common.h: Likewise.
	* jit-playback.c: Likewise.

lto
	* lto-lang.c: Adjust includes for flags.h changes.

From-SVN: r225608

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e7f7dace4b4faa899f2541443994a52494d37cfb..b20c00351c674744932eafbf4cb7ed3eb926e122 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-09  Andrew MacLeod  <amacleod@redhat.com>
+
+       * flags.h: Don't include flag-types.h or options.h.
+       * opts-common.c: Adjust includes.
+       * opts-global.c: Likewise.
+       * common/config/epiphany/epiphany-common.c: Likewise.
+
 2015-07-09  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR target/66818

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 75e43fd7f09806bf53f8b9e6c531cdb30a90ae8f..b9120938c493bbbfee15bb0835493a74f1566707 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-09  Andrew MacLeod  <amacleod@redhat.com>
+
+       * c-common.h: Adjust includes for flags.h changes.
+       * stub-objc.c: Likewise.
+       
 2015-07-08  Eric Botcazou  <ebotcazou@adacore.com>
 
        * c-ada-spec.h (cpp_operation): Add IS_CONSTEXPR.

diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
index 1acce015684eb1b1c05d002850b7b5f019edfdba..a2a46212e8320261ca698a50b923802e29391915 100644 (file)
--- a/gcc/c-family/c-common.h
+++ b/gcc/c-family/c-common.h
@@ -23,7 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "splay-tree.h"
 #include "cpplib.h"
 #include "alias.h"
-#include "flags.h"
 #include "tree.h"
 #include "fold-const.h"
 

diff --git a/gcc/c-family/stub-objc.c b/gcc/c-family/stub-objc.c
index dd4c9fead9bd7c615f51b0959e3558fea8c20702..fb6037b66589e690cc1d0908ac8bd50c1d54138a 100644 (file)
--- a/gcc/c-family/stub-objc.c
+++ b/gcc/c-family/stub-objc.c
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "alias.h"
 #include "tree.h"
-#include "flags.h"
 #include "c-common.h"
 #include "c-objc.h"
 

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 792198b8f0fb645c1bee6d9aad758b4350365343..a75f2e8a292d7635ff1bfbe48166c44f6f7ded54 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-09  Andrew MacLeod  <amacleod@redhat.com>
+
+       * c-array-notation.c: Adjust includes for flags.h changes.
+       * c-objc-common.c: Likewise.
+
 2015-07-07  Andrew MacLeod  <amacleod@redhat.com>
 
        * c-array-notation.c: Adjust includes.

diff --git a/gcc/c/c-array-notation.c b/gcc/c/c-array-notation.c
index 26147cec9609294609f7eaa98ff16e518f6c13a8..3de75692973a3833bd2ed2cb7a14e55f6a6cc65c 100644 (file)
--- a/gcc/c/c-array-notation.c
+++ b/gcc/c/c-array-notation.c
@@ -70,7 +70,6 @@
 #include "coretypes.h"
 #include "tree.h"
 #include "alias.h"
-#include "flags.h"
 #include "c-tree.h"
 #include "gimple-expr.h"
 #include "tree-iterator.h"

diff --git a/gcc/c/c-objc-common.c b/gcc/c/c-objc-common.c
index bbb949a8051430b08e2474008b56b6cef49f1df0..47fd7de05ed5dd24ea1b10777d7e2d97c2c0b128 100644 (file)
--- a/gcc/c/c-objc-common.c
+++ b/gcc/c/c-objc-common.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tree.h"
 #include "alias.h"
-#include "flags.h"
 #include "c-tree.h"
 #include "intl.h"
 #include "c-family/c-pretty-print.h"

diff --git a/gcc/common/config/epiphany/epiphany-common.c b/gcc/common/config/epiphany/epiphany-common.c
index d7e62678473de5ff397bd9b4b46a16638acd6f42..52504d057cb8c8b84117facf64689f00b5d902db 100644 (file)
--- a/gcc/common/config/epiphany/epiphany-common.c
+++ b/gcc/common/config/epiphany/epiphany-common.c
@@ -23,7 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "common/common-target.h"
 #include "opts.h"
-#include "flags.h"
+#include "options.h"
 
 #define TARGET_OPTION_OPTIMIZATION_TABLE epiphany_option_optimization_table
 

diff --git a/gcc/flags.h b/gcc/flags.h
index 22abddcd4693e9d1884bc5339b0e202c5bc74526..785b521970a7069a98c72c9a2f0317168f346d38 100644 (file)
--- a/gcc/flags.h
+++ b/gcc/flags.h
@@ -20,9 +20,6 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_FLAGS_H
 #define GCC_FLAGS_H
 
-#include "flag-types.h"
-#include "options.h"
-
 #if !defined(IN_LIBGCC2) && !defined(IN_TARGET_LIBS) && !defined(IN_RTS)
 
 /* Names of debug_info_type, for error messages.  */

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 295229a52cb8d26e3a55dbf2c85fce958e75965d..1e0d031b96f064a0660fc97841711207a391e703 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,25 @@
+2015-07-09  Andrew MacLeod  <amacleod@redhat.com>
+
+       * arith.c: Adjust includes for flags.h changes.
+       * array.c: Likewise.
+       * check.c: Likewise.
+       * decl.c: Likewise.
+       * error.c: Likewise.
+       * expr.c: Likewise.
+       * frontend-passes.c: Likewise.
+       * interface.c: Likewise.
+       * intrinsic.c: Likewise.
+       * io.c: Likewise.
+       * match.c: Likewise.
+       * openmp.c: Likewise.
+       * parse.c: Likewise.
+       * primary.c: Likewise.
+       * resolve.c: Likewise.
+       * scanner.c: Likewise.
+       * simplify.c: Likewise.
+       * symbol.c: Likewise.
+       * target-memory.c: Likewise.
+
 2015-07-07  Andrew MacLeod  <amacleod@redhat.com>
 
        * convert.c: Adjust includes.

diff --git a/gcc/fortran/arith.c b/gcc/fortran/arith.c
index 6c31b706a968244abc6cf3ba69eee5cecb007556..e4da3b927fc8727c03e4834ae7fbd068217b1318 100644 (file)
--- a/gcc/fortran/arith.c
+++ b/gcc/fortran/arith.c
@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "arith.h"
 #include "target-memory.h"

diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 1ab3cd0f34ce0e09221c25baf72af9c490bdbb40..276737b412125b743572cdb431136106f7515cb9 100644 (file)
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
+#include "options.h"
 #include "flags.h"
 #include "gfortran.h"
 #include "match.h"

diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index 3286a58df5cf348152d6f0d72b178fe510e5ec00..6548a017f446bee3c67b0547bf2c064ca27c7f54 100644 (file)
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -28,7 +28,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "intrinsic.h"
 #include "constructor.h"

diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 8ab4d79fb9e66915486e729b64787f2af5a798f6..49460613b4aacce6d9afbda18109941b3d636ed7 100644 (file)
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -24,7 +24,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "gfortran.h"
 #include "match.h"
 #include "parse.h"
-#include "flags.h"
+#include "options.h"
 #include "constructor.h"
 #include "alias.h"
 #include "tree.h"

diff --git a/gcc/fortran/error.c b/gcc/fortran/error.c
index c7d8581f9708bac7e587b3bec5b7dbca90cf6c0a..7689bbd89415d8c90f7652c2b36cec1b3ca8c1d2 100644 (file)
--- a/gcc/fortran/error.c
+++ b/gcc/fortran/error.c
@@ -27,7 +27,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 
 #include "diagnostic.h"

diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index d7a90c442444b0ad5443bf77ce734bf8caec14cc..9e5a804f70dccd5d9c3bc2bb504ac5f3380f41f2 100644 (file)
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -21,7 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "arith.h"
 #include "match.h"

diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c
index 3eda42f70a9a3f6c60275ae3d2d01e4657b109b3..bc9f6210f4f6d103408be3108d1609851e1709bb 100644 (file)
--- a/gcc/fortran/frontend-passes.c
+++ b/gcc/fortran/frontend-passes.c
@@ -23,7 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "gfortran.h"
 #include "arith.h"
-#include "flags.h"
+#include "options.h"
 #include "dependency.h"
 #include "constructor.h"
 #include "opts.h"

diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index 59569347789546b10ebd38e05e8ba362f45ace67..2ea26304a24af698745fefb0668e3e827013c503 100644 (file)
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -66,7 +66,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "match.h"
 #include "arith.h"

diff --git a/gcc/fortran/intrinsic.c b/gcc/fortran/intrinsic.c
index 5666bfff9a26e063fb2701e6c10eeeee86ec78ca..a80b16e68b4663f6928cef1a7212b48a3592f9f4 100644 (file)
--- a/gcc/fortran/intrinsic.c
+++ b/gcc/fortran/intrinsic.c
@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "intrinsic.h"
 

diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
index e8395b5480d53ba04888252e7d08e1c7f19f2522..d50a45a5956ee5fd53443e90732b6531b9f1937a 100644 (file)
--- a/gcc/fortran/io.c
+++ b/gcc/fortran/io.c
@@ -21,7 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "match.h"
 #include "parse.h"

diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index 14035319dd56cd7d763506a6cdc46ec7177e3765..523e9b2a7f5ed4d340f379d5423a8563830dcf66 100644 (file)
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -21,6 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
+#include "options.h"
 #include "flags.h"
 #include "gfortran.h"
 #include "match.h"

diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 8d1060891d8865bf6871db49185ba5ea9b7ee7b5..3c12d8e67f6cef3a70f3b4e3ffeb60903bc8c6f5 100644 (file)
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
 #include "gfortran.h"
 #include "arith.h"
 #include "match.h"

diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index 148cff94fb64092be8e81850da20665fc458ee7e..45ad63ff7ee3a8c4f7a0b4a4e27de7732b0c1c06 100644 (file)
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include <setjmp.h>
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "match.h"
 #include "parse.h"

diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c
index acde051cdb327e2f60a3297a7cfb0b5408f1db06..c8c65816a3369e9bce85f4d4809e84fc9e725cd1 100644 (file)
--- a/gcc/fortran/primary.c
+++ b/gcc/fortran/primary.c
@@ -21,7 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "arith.h"
 #include "match.h"

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index d16bf13eb051e221bc8524c09ab4f0d7e82abbc7..641a3bdaa9ac9396df6342d5e945433d2d4a2364 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -21,7 +21,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "obstack.h"
 #include "bitmap.h"

diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
index e5243457ad008faed7ac8f8be195db23c5f58dac..bfb7d452e9040136de5f8a35e5a85f7b18301883 100644 (file)
--- a/gcc/fortran/scanner.c
+++ b/gcc/fortran/scanner.c
@@ -46,7 +46,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "gfortran.h"
 #include "toplev.h"    /* For set_src_pwd.  */
 #include "debug.h"
-#include "flags.h"
+#include "options.h"
 #include "cpp.h"
 #include "scanner.h"
 

diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 2f3e247cd083bd4db557650af71eb34339476487..bc3ec3f8a602c99d27f64841b80f594835376d50 100644 (file)
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
 #include "gfortran.h"
 #include "arith.h"
 #include "intrinsic.h"

diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index b7d5b86791bbec8c5deb5ce83d8f25fe322cc6d1..52c5234276af0a80c7bb3d9da3b9db09b4894780 100644 (file)
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
+#include "options.h"
 #include "gfortran.h"
 #include "parse.h"
 #include "match.h"

diff --git a/gcc/fortran/target-memory.c b/gcc/fortran/target-memory.c
index 9895bc315f1ebed931b5a32406d10991a007cbca..a58a97747c873c6f50124a83d012c758f9cebd31 100644 (file)
--- a/gcc/fortran/target-memory.c
+++ b/gcc/fortran/target-memory.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
 #include "alias.h"
 #include "tree.h"
 #include "fold-const.h"

diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog
index e9a32f0ae966a09ace1fc00ca9b14227574e12a6..cb021a82b49bd5be807e90d5b22ff3b14c1ffeb3 100644 (file)
--- a/gcc/jit/ChangeLog
+++ b/gcc/jit/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-09  Andrew MacLeod  <amacleod@redhat.com>
+
+       * dummy-frontend.c: Adjust includes for flags.h changes.
+       * jit-common.h: Likewise.
+       * jit-playback.c: Likewise.
+
 2015-07-08  David Malcolm  <dmalcolm@redhat.com>
 
        PR jit/66783

diff --git a/gcc/jit/dummy-frontend.c b/gcc/jit/dummy-frontend.c
index 3d0b3ea76409ea24faffbb355cccd83f4a0e9278..1a6b09a35d125919210160a642cb7b5a7d4a0c28 100644 (file)
--- a/gcc/jit/dummy-frontend.c
+++ b/gcc/jit/dummy-frontend.c
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "opts.h"
 #include "alias.h"
-#include "flags.h"
 #include "tree.h"
 #include "stor-layout.h"
 #include "inchash.h"

diff --git a/gcc/jit/jit-common.h b/gcc/jit/jit-common.h
index 28ce2bcb4e92028e91f0c6d6a1f24497d4745e21..e6fc132c6c223b06e81388cf2d200cd285b958f9 100644 (file)
--- a/gcc/jit/jit-common.h
+++ b/gcc/jit/jit-common.h
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "libgccjit.h"
 
 #include "vec.h"
-#include "flags.h"
 #include "tree.h"
 #include "inchash.h"
 #include "tree-iterator.h"

diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
index 2b99c49613ffef8861a489d994118b929be2c491..9f8ec4ae57da8931239578809dbc7117484bcd91 100644 (file)
--- a/gcc/jit/jit-playback.c
+++ b/gcc/jit/jit-playback.c
@@ -26,7 +26,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "statistics.h"
 #include "vec.h"
 #include "alias.h"
-#include "flags.h"
 #include "tree.h"
 #include "inchash.h"
 #include "hash-map.h"

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 2390de63d5ce8742468bd53cdd299e85cb8bd0b9..03d06e2e4cdc3c0fa6be98e2ef0e16771a74bc60 100644 (file)
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-09  Andrew MacLeod  <amacleod@redhat.com>
+
+       * lto-lang.c: Adjust includes for flags.h changes.
+
 2015-07-07  Andrew MacLeod  <amacleod@redhat.com>
 
        * lto-lang.c: Adjust includes.

diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c
index 3e878527fb2d5f27ccd19c759587947a0c6c3a9a..9bf6496ec65c4dcbf63ab6f0706fd74c1862f1bf 100644 (file)
--- a/gcc/lto/lto-lang.c
+++ b/gcc/lto/lto-lang.c
@@ -21,7 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "flags.h"
 #include "tm.h"
 #include "function.h"
 #include "predict.h"

diff --git a/gcc/opts-common.c b/gcc/opts-common.c
index e53e85fd0d5a8ac26c2cadd5bcc4ca15f19dda7b..8e519742ba7e178103ccaf3bd96c86d6245e6731 100644 (file)
--- a/gcc/opts-common.c
+++ b/gcc/opts-common.c
@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "intl.h"
 #include "coretypes.h"
 #include "opts.h"
-#include "flags.h"
+#include "options.h"
 #include "diagnostic.h"
 
 static void prune_options (struct cl_decoded_option **, unsigned int *);

diff --git a/gcc/opts-global.c b/gcc/opts-global.c
index 30563019e29ab45f938ba660e8e982d813976e21..50b32ac4502d942eebf22b91db45eadb5210dfc8 100644 (file)
--- a/gcc/opts-global.c
+++ b/gcc/opts-global.c
@@ -23,6 +23,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "diagnostic.h"
 #include "opts.h"
+#include "options.h"
 #include "flags.h"
 #include "alias.h"
 #include "backend.h"