5 files changed, 16 insertions, 14 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 743764b..d48ff16 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-25  Steven Bosscher  <steven@gcc.gnu.org>
+
+	* objc-act.h: Do not include gimple.h.
+	* objc-act.c: Do not include rtl.h, expr.h, libfuncs.h, and tm_p.h.
+	Include gimple.h.  Explain why except.h has to be included.
+	* objc-lang.c: Do not include diagnostics.h.
+	* Make-lang.in: Update dependencies.
+
 2010-05-25  Nathan Froyd  <froydnj@codesourcery.com>
 
 	* objc-act.c (objc_build_constructor): Adjust OBJCPLUS impedance
diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in
index d4da736..144d01a 100644
--- a/gcc/objc/Make-lang.in
+++ b/gcc/objc/Make-lang.in
@@ -69,14 +69,13 @@ cc1obj$(exeext): $(OBJC_OBJS) $(C_AND_OBJC_OBJS) cc1obj-checksum.o $(BACKEND) $(
 # Objective C language specific files.
 
 objc/objc-lang.o : objc/objc-lang.c \
-   $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
-   $(C_TREE_H) $(DIAGNOSTIC_H) \
+   $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(C_TREE_H) \
    $(GGC_H) langhooks.h $(LANGHOOKS_DEF_H) $(C_COMMON_H) gtype-objc.h \
-   c-objc-common.h objc/objc-act.h $(GIMPLE_H)
+   c-objc-common.h objc/objc-act.h
 
 objc/objc-act.o : objc/objc-act.c \
-   $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(RTL_H) $(TM_P_H) \
-   $(EXPR_H) $(TARGET_H) $(C_TREE_H) $(DIAGNOSTIC_H) toplev.h $(FLAGS_H) \
+   $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
+   $(TARGET_H) $(C_TREE_H) $(DIAGNOSTIC_H) toplev.h $(FLAGS_H) \
    objc/objc-act.h input.h $(FUNCTION_H) output.h debug.h langhooks.h \
    $(LANGHOOKS_DEF_H) $(HASHTAB_H) $(C_PRAGMA_H) gt-objc-objc-act.h \
    $(GIMPLE_H) c-lang.h
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 5961531..b1ca2e4 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -45,9 +45,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
-#include "rtl.h"
-#include "tm_p.h"
-#include "expr.h"
 
 #ifdef OBJCPLUS
 #include "cp-tree.h"
@@ -62,7 +59,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "langhooks.h"
 #include "objc-act.h"
 #include "input.h"
-#include "except.h"
+#include "except.h"	/* For USING_SJLJ_EXCEPTIONS.  */
 #include "function.h"
 #include "output.h"
 #include "toplev.h"
@@ -73,10 +70,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "intl.h"
 #include "cgraph.h"
 #include "tree-iterator.h"
-#include "libfuncs.h"
 #include "hashtab.h"
 #include "langhooks-def.h"
 
+/* For enum gimplify_status */
+#include "gimple.h"
+
 #define OBJC_VOID_AT_END	void_list_node
 
 static unsigned int should_call_super_dealloc = 0;
diff --git a/gcc/objc/objc-act.h b/gcc/objc/objc-act.h
index f0970f9..d8bf0f6 100644
--- a/gcc/objc/objc-act.h
+++ b/gcc/objc/objc-act.h
@@ -22,9 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_OBJC_ACT_H
 #define GCC_OBJC_ACT_H
 
-/* For enum gimplify_status */
-#include "gimple.h"
-
 /*** Language hooks ***/
 
 bool objc_init (void);
diff --git a/gcc/objc/objc-lang.c b/gcc/objc/objc-lang.c
index acb1c84..04cea97 100644
--- a/gcc/objc/objc-lang.c
+++ b/gcc/objc/objc-lang.c
@@ -31,7 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "objc-act.h"
 #include "langhooks.h"
 #include "langhooks-def.h"
-#include "diagnostic.h"
 #include "c-objc-common.h"
 
 enum c_language_kind c_language = clk_objc;