cleanup: Remove unnecessary #include "beirg.h".

diff --git a/ir/be/TEMPLATE/bearch_TEMPLATE.c b/ir/be/TEMPLATE/bearch_TEMPLATE.c
index 21344c2..99cbb2f 100644 (file)
--- a/ir/be/TEMPLATE/bearch_TEMPLATE.c
+++ b/ir/be/TEMPLATE/bearch_TEMPLATE.c
@@ -36,7 +36,7 @@
 #include "bitset.h"
 #include "debug.h"
 
-#include "be.h"
+#include "be_t.h"
 #include "bearch.h"
 #include "benode.h"
 #include "belower.h"

diff --git a/ir/be/amd64/bearch_amd64.c b/ir/be/amd64/bearch_amd64.c
index 6cb1dab..4cf0f40 100644 (file)
--- a/ir/be/amd64/bearch_amd64.c
+++ b/ir/be/amd64/bearch_amd64.c
@@ -35,8 +35,9 @@
 #include "debug.h"
 #include "error.h"
 
-#include "be.h"
+#include "be_t.h"
 #include "bearch.h"
+#include "beirg.h"
 #include "benode.h"
 #include "belower.h"
 #include "besched.h"

diff --git a/ir/be/beblocksched.c b/ir/be/beblocksched.c
index f3b46cd..7922129 100644 (file)
--- a/ir/be/beblocksched.c
+++ b/ir/be/beblocksched.c
@@ -41,7 +41,7 @@
 
 #include "array.h"
 #include "pdeq.h"
-
+#include "beirg.h"
 #include "iredges.h"
 #include "irgwalk.h"
 #include "irnode_t.h"

diff --git a/ir/be/bechordal_common.c b/ir/be/bechordal_common.c
index bc1cc2d..8049f05 100644 (file)
--- a/ir/be/bechordal_common.c
+++ b/ir/be/bechordal_common.c
@@ -34,6 +34,7 @@
 
 #include "bechordal.h"
 #include "bechordal_t.h"
+#include "beirg.h"
 #include "beirgmod.h"
 #include "beinsn_t.h"
 #include "besched.h"

diff --git a/ir/be/bechordal_t.h b/ir/be/bechordal_t.h
index 12e7499..e7cc1df 100644 (file)
--- a/ir/be/bechordal_t.h
+++ b/ir/be/bechordal_t.h
@@ -34,7 +34,6 @@
 #include "debug.h"
 
 #include "bechordal.h"
-#include "beirg.h"
 #include "beifg.h"
 
 /**

diff --git a/ir/be/becopyheur2.c b/ir/be/becopyheur2.c
index 0ec32d1..1d727c0 100644 (file)
--- a/ir/be/becopyheur2.c
+++ b/ir/be/becopyheur2.c
@@ -45,14 +45,13 @@
 #include "util.h"
 #include "irtools.h"
 #include "irnodemap.h"
-
+#include "be_t.h"
 #include "bemodule.h"
 #include "beabi.h"
 #include "benode.h"
 #include "becopyopt.h"
 #include "becopyopt_t.h"
 #include "bechordal_t.h"
-#include "beirg.h"
 
 #define DUMP_BEFORE 1
 #define DUMP_AFTER  2

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index e4c6ace..c45b7c4 100644 (file)
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -27,11 +27,11 @@
 
 #include <stdbool.h>
 
+#include "be_t.h"
 #include "irtools.h"
 #include "irprintf.h"
 
 #include "statev_t.h"
-#include "beirg.h"
 #include "bemodule.h"
 #include "error.h"
 

diff --git a/ir/be/becopyilp2.c b/ir/be/becopyilp2.c
index 82cb443..cf819a5 100644 (file)
--- a/ir/be/becopyilp2.c
+++ b/ir/be/becopyilp2.c
@@ -45,6 +45,7 @@
  */
 #include "config.h"
 
+#include "be_t.h"
 #include "bitset.h"
 #include "error.h"
 #include "raw_bitset.h"

diff --git a/ir/be/becopystat.c b/ir/be/becopystat.c
index e473a8d..7063e98 100644 (file)
--- a/ir/be/becopystat.c
+++ b/ir/be/becopystat.c
@@ -39,7 +39,6 @@
 #include "beutil.h"
 #include "becopyopt_t.h"
 #include "becopystat.h"
-#include "beirg.h"
 #include "bemodule.h"
 #include "beintlive_t.h"
 

diff --git a/ir/be/beflags.h b/ir/be/beflags.h
index a7af4fd..6c5eb92 100644 (file)
--- a/ir/be/beflags.h
+++ b/ir/be/beflags.h
@@ -26,7 +26,6 @@
 #define FIRM_BE_BEFLAGS_H
 
 #include "bearch.h"
-#include "beirg.h"
 
 /**
  * Callback which rematerializes (=duplicates) a machine node.

diff --git a/ir/be/beinsn.c b/ir/be/beinsn.c
index a3f305d..2370171 100644 (file)
--- a/ir/be/beinsn.c
+++ b/ir/be/beinsn.c
@@ -32,7 +32,6 @@
 #include "bechordal_t.h"
 #include "besched.h"
 #include "beinsn_t.h"
-#include "beirg.h"
 #include "beabi.h"
 #include "raw_bitset.h"
 

diff --git a/ir/be/beinsn_t.h b/ir/be/beinsn_t.h
index 1c9ab1b..d4003f0 100644 (file)
--- a/ir/be/beinsn_t.h
+++ b/ir/be/beinsn_t.h
@@ -31,7 +31,6 @@
 
 #include "bearch.h"
 #include "bechordal.h"
-#include "beirg.h"
 
 typedef struct be_operand_t  be_operand_t;
 typedef struct be_insn_t     be_insn_t;

diff --git a/ir/be/beirgmod.h b/ir/be/beirgmod.h
index 861720a..5447a38 100644 (file)
--- a/ir/be/beirgmod.h
+++ b/ir/be/beirgmod.h
@@ -31,8 +31,8 @@
 #ifndef FIRM_BE_BEIRGMOD_H
 #define FIRM_BE_BEIRGMOD_H
 
+#include "be_types.h"
 #include "firm_types.h"
-#include "beirg.h"
 
 /**
  * Insert a Perm which permutes all (non-ignore) live values of a given register class

diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c
index 20f8fbc..f9f2b65 100644 (file)
--- a/ir/be/belistsched.c
+++ b/ir/be/belistsched.c
@@ -54,7 +54,6 @@
 #include "belistsched.h"
 #include "bearch.h"
 #include "bestat.h"
-#include "beirg.h"
 
 #include "lc_opts.h"
 #include "lc_opts_enum.h"

diff --git a/ir/be/belistsched.h b/ir/be/belistsched.h
index 3af7e37..eb749c9 100644 (file)
--- a/ir/be/belistsched.h
+++ b/ir/be/belistsched.h
@@ -32,7 +32,6 @@
 #include "be.h"
 #include "be_types.h"
 #include "bearch.h"
-#include "beirg.h"
 
 /**
  * A selector interface which is used by the list schedule framework.

diff --git a/ir/be/belive.c b/ir/be/belive.c
index 62594ce..995b144 100644 (file)
--- a/ir/be/belive.c
+++ b/ir/be/belive.c
@@ -36,11 +36,10 @@
 
 #include "absgraph.h"
 #include "statev_t.h"
-
+#include "be_t.h"
 #include "bearch.h"
 #include "beutil.h"
 #include "belive_t.h"
-#include "beirg.h"
 #include "besched.h"
 #include "bemodule.h"
 #include "bedump.h"

diff --git a/ir/be/beloopana.c b/ir/be/beloopana.c
index f83e4c9..c1190da 100644 (file)
--- a/ir/be/beloopana.c
+++ b/ir/be/beloopana.c
@@ -34,6 +34,7 @@
 #include "debug.h"
 
 #include "bearch.h"
+#include "beirg.h"
 #include "belive.h"
 #include "besched.h"
 #include "beloopana.h"

diff --git a/ir/be/beloopana.h b/ir/be/beloopana.h
index 327f608..a1bc614 100644 (file)
--- a/ir/be/beloopana.h
+++ b/ir/be/beloopana.h
@@ -29,7 +29,6 @@
 #include "irloop.h"
 
 #include "bearch.h"
-#include "beirg.h"
 
 typedef struct be_loopana_t be_loopana_t;
 

diff --git a/ir/be/belower.c b/ir/be/belower.c
index eebec36..e8169a0 100644 (file)
--- a/ir/be/belower.c
+++ b/ir/be/belower.c
@@ -39,6 +39,7 @@
 #include "array_t.h"
 
 #include "bearch.h"
+#include "beirg.h"
 #include "belower.h"
 #include "benode.h"
 #include "besched.h"

diff --git a/ir/be/belower.h b/ir/be/belower.h
index daf56e8..e739616 100644 (file)
--- a/ir/be/belower.h
+++ b/ir/be/belower.h
@@ -27,7 +27,7 @@
 #ifndef FIRM_BE_BELOWER_H
 #define FIRM_BE_BELOWER_H
 
-#include "beirg.h"
+#include "firm_types.h"
 
 /**
  * Walks over all nodes to assure register constraints.

diff --git a/ir/be/benode.c b/ir/be/benode.c
index a0ce327..b4a2197 100644 (file)
--- a/ir/be/benode.c
+++ b/ir/be/benode.c
@@ -30,6 +30,7 @@
 
 #include <stdlib.h>
 
+#include "beirg.h"
 #include "obst.h"
 #include "set.h"
 #include "pmap.h"

diff --git a/ir/be/bepeephole.h b/ir/be/bepeephole.h
index a47cfce..757fe4b 100644 (file)
--- a/ir/be/bepeephole.h
+++ b/ir/be/bepeephole.h
@@ -25,7 +25,6 @@
 #ifndef BEPEEPHOLE_H
 #define BEPEEPHOLE_H
 
-#include "beirg.h"
 #include "bearch.h"
 
 extern ir_node **register_values;

diff --git a/ir/be/bera.h b/ir/be/bera.h
index a5798d6..573d9bb 100644 (file)
--- a/ir/be/bera.h
+++ b/ir/be/bera.h
@@ -26,10 +26,7 @@
 #ifndef FIRM_BE_BERA_H
 #define FIRM_BE_BERA_H
 
-#include "irnode.h"
-
-#include "belive.h"
-#include "beirg.h"
+#include "firm_types.h"
 
 typedef struct be_ra_t {
        void (*allocate)(ir_graph *irg);   /**< allocate registers on a graph */

diff --git a/ir/be/beschedtrace.c b/ir/be/beschedtrace.c
index d67d622..2ad2581 100644 (file)
--- a/ir/be/beschedtrace.c
+++ b/ir/be/beschedtrace.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 
 #include "iredges_t.h"
-
+#include "beirg.h"
 #include "besched.h"
 #include "belistsched.h"
 #include "benode.h"

diff --git a/ir/be/bespill.h b/ir/be/bespill.h
index a704635..843a0df 100644 (file)
--- a/ir/be/bespill.h
+++ b/ir/be/bespill.h
@@ -27,7 +27,6 @@
 #define FIRM_BE_BESPILL_H
 
 #include "bearch.h"
-#include "beirg.h"
 
 extern int be_coalesce_spill_slots;
 extern int be_do_remats;

diff --git a/ir/be/bespilldaemel.c b/ir/be/bespilldaemel.c
index f25977c..f248de4 100644 (file)
--- a/ir/be/bespilldaemel.c
+++ b/ir/be/bespilldaemel.c
@@ -50,7 +50,6 @@
 #include "bearch.h"
 #include "be_t.h"
 #include "benode.h"
-#include "beirg.h"
 #include "belive.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)

diff --git a/ir/be/bespillslots.h b/ir/be/bespillslots.h
index 56d884c..7a251f8 100644 (file)
--- a/ir/be/bespillslots.h
+++ b/ir/be/bespillslots.h
@@ -27,7 +27,6 @@
 #define FIRM_BE_BESPILLSLOTS_H
 
 #include <stdbool.h>
-#include "beirg.h"
 
 typedef struct be_fec_env_t be_fec_env_t;
 

diff --git a/ir/be/bespillutil.h b/ir/be/bespillutil.h
index 10ee33f..b093523 100644 (file)
--- a/ir/be/bespillutil.h
+++ b/ir/be/bespillutil.h
@@ -31,7 +31,6 @@
 #include "debug.h"
 
 #include "bearch.h"
-#include "beirg.h"
 
 typedef struct spill_env_t spill_env_t;
 

diff --git a/ir/be/bessaconstr.h b/ir/be/bessaconstr.h
index bc63d7e..0186d46 100644 (file)
--- a/ir/be/bessaconstr.h
+++ b/ir/be/bessaconstr.h
@@ -53,7 +53,6 @@
 #include "irnodeset.h"
 #include "belive.h"
 #include "bitset.h"
-#include "beirg.h"
 #include "pdeq.h"
 #include "irnodemap.h"
 #include "obst.h"

diff --git a/ir/be/bestat.h b/ir/be/bestat.h
index ada6fcc..1be1972 100644 (file)
--- a/ir/be/bestat.h
+++ b/ir/be/bestat.h
@@ -28,7 +28,6 @@
 #include "firm_types.h"
 #include "irnodeset.h"
 
-#include "beirg.h"
 #include "bearch.h"
 
 typedef enum be_stat_tag_t {

diff --git a/ir/be/bestate.c b/ir/be/bestate.c
index 4cf17d1..52dc3df 100644 (file)
--- a/ir/be/bestate.c
+++ b/ir/be/bestate.c
@@ -41,6 +41,7 @@
 #include "cpset.h"
 
 #include "bearch.h"
+#include "beirg.h"
 #include "beuses.h"
 #include "besched.h"
 #include "belive_t.h"

diff --git a/ir/be/bestate.h b/ir/be/bestate.h
index 3191a10..d0322be 100644 (file)
--- a/ir/be/bestate.h
+++ b/ir/be/bestate.h
@@ -28,7 +28,6 @@
 #define FIRM_BE_BESTATE_H
 
 #include "firm_types.h"
-#include "beirg.h"
 #include "bearch.h"
 
 /**

diff --git a/ir/be/betranshlp.h b/ir/be/betranshlp.h
index 7e4622f..a45e2e8 100644 (file)
--- a/ir/be/betranshlp.h
+++ b/ir/be/betranshlp.h
@@ -26,8 +26,8 @@
 #ifndef FIRM_BE_BETRANSHLP_H
 #define FIRM_BE_BETRANSHLP_H
 
+#include "be_types.h"
 #include "firm_types.h"
-#include "beirg.h"
 
 /**
  * A callback to pre-transform some nodes before the transformation starts.

diff --git a/ir/be/beverify.h b/ir/be/beverify.h
index ee625fd..aa2b9bb 100644 (file)
--- a/ir/be/beverify.h
+++ b/ir/be/beverify.h
@@ -29,7 +29,6 @@
 #include <stdbool.h>
 #include "irgraph.h"
 
-#include "beirg.h"
 #include "bearch.h"
 
 /**

diff --git a/ir/be/ia32/bearch_ia32.c b/ir/be/ia32/bearch_ia32.c
index d6130c6..d4a887d 100644 (file)
--- a/ir/be/ia32/bearch_ia32.c
+++ b/ir/be/ia32/bearch_ia32.c
@@ -55,7 +55,6 @@
 #include "lower_softfloat.h"
 
 #include "beabi.h"
-#include "beirg.h"
 #include "benode.h"
 #include "belower.h"
 #include "besched.h"

diff --git a/ir/be/ia32/ia32_address_mode.h b/ir/be/ia32/ia32_address_mode.h
index c256065..81dab6d 100644 (file)
--- a/ir/be/ia32/ia32_address_mode.h
+++ b/ir/be/ia32/ia32_address_mode.h
@@ -28,7 +28,6 @@
 
 #include <stdbool.h>
 #include "irtypes.h"
-#include "beirg.h"
 
 /**
  * The address mode data: Used to construct (memory) address modes.

diff --git a/ir/be/ia32/ia32_architecture.h b/ir/be/ia32/ia32_architecture.h
index c96eaac..1f44c72 100644 (file)
--- a/ir/be/ia32/ia32_architecture.h
+++ b/ir/be/ia32/ia32_architecture.h
@@ -25,6 +25,8 @@
 #ifndef FIRM_BE_IA32_ARCHITECTURE_H
 #define FIRM_BE_IA32_ARCHITECTURE_H
 
+#include "irarch.h"
+
 typedef struct {
        /** optimize for size */
        unsigned optimize_size:1;

diff --git a/ir/be/ia32/ia32_common_transform.c b/ir/be/ia32/ia32_common_transform.c
index 5a50bee..11ed215 100644 (file)
--- a/ir/be/ia32/ia32_common_transform.c
+++ b/ir/be/ia32/ia32_common_transform.c
@@ -33,7 +33,6 @@
 #include "heights.h"
 
 #include "betranshlp.h"
-#include "beirg.h"
 #include "beabi.h"
 
 #include "ia32_architecture.h"

diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c
index 7d6d3ec..4624114 100644 (file)
--- a/ir/be/ia32/ia32_emitter.c
+++ b/ir/be/ia32/ia32_emitter.c
@@ -68,7 +68,6 @@
 #include "bedwarf.h"
 #include "beemitter.h"
 #include "begnuas.h"
-#include "beirg.h"
 
 #include "ia32_emitter.h"
 #include "ia32_common_transform.h"

diff --git a/ir/be/ia32/ia32_fpu.c b/ir/be/ia32/ia32_fpu.c
index 54e0680..1ff1750 100644 (file)
--- a/ir/be/ia32/ia32_fpu.c
+++ b/ir/be/ia32/ia32_fpu.c
@@ -47,7 +47,6 @@
 #include "bestate.h"
 #include "beutil.h"
 #include "bessaconstr.h"
-#include "beirg.h"
 
 static ir_entity *fpcw_round    = NULL;
 static ir_entity *fpcw_truncate = NULL;

diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c
index 74a2221..a314bd9 100644 (file)
--- a/ir/be/ia32/ia32_transform.c
+++ b/ir/be/ia32/ia32_transform.c
@@ -51,7 +51,6 @@
 #include "besched.h"
 #include "beabi.h"
 #include "beutil.h"
-#include "beirg.h"
 #include "betranshlp.h"
 #include "be_t.h"
 

diff --git a/ir/be/ia32/ia32_x87.h b/ir/be/ia32/ia32_x87.h
index f3857e7..e91dcf6 100644 (file)
--- a/ir/be/ia32/ia32_x87.h
+++ b/ir/be/ia32/ia32_x87.h
@@ -26,8 +26,7 @@
 #ifndef FIRM_BE_IA32_IA32_X87_H
 #define FIRM_BE_IA32_IA32_X87_H
 
-#include "bearch.h"
-#include "beirg.h"
+#include "firm_types.h"
 
 /**
  * Run a simulation and fix all virtual instructions for a graph.

diff --git a/ir/be/sparc/bearch_sparc.c b/ir/be/sparc/bearch_sparc.c
index 1af0d49..81fece4 100644 (file)
--- a/ir/be/sparc/bearch_sparc.c
+++ b/ir/be/sparc/bearch_sparc.c
@@ -50,14 +50,12 @@
 #include "array_t.h"
 #include "error.h"
 #include "util.h"
-
+#include "be_t.h"
 #include "bearch.h"
 #include "benode.h"
 #include "belower.h"
 #include "besched.h"
-#include "be.h"
 #include "bemodule.h"
-#include "beirg.h"
 #include "begnuas.h"
 #include "belistsched.h"
 #include "beflags.h"

diff --git a/ir/be/sparc/sparc_finish.c b/ir/be/sparc/sparc_finish.c
index 65a08d4..ad29fce 100644 (file)
--- a/ir/be/sparc/sparc_finish.c
+++ b/ir/be/sparc/sparc_finish.c
@@ -47,7 +47,7 @@
 #include "ircons.h"
 #include "irgwalk.h"
 #include "heights.h"
-
+#include "beirg.h"
 #include "bepeephole.h"
 #include "benode.h"
 #include "besched.h"