diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ac73a66673a..bf82ac9e3b3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-29  Joern Rennecke  <amylaar@spamcop.net>
+
+	PR tree-optimization/46621
+	* gimple.h: Don't include tm.h or hard-reg-set.h .
+	* Makefile.in (GIMPLE_H): Remove $(TM_H).
+
 2010-11-27  Jan Hubicka  <jh@suse.cz>
 
 	* dwarf2out.c (dwarf2out_begin_function): Set cold_text_section
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 81742e62173..97ddf4690bd 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -897,7 +897,7 @@ TREE_H = tree.h all-tree.def tree.def c-family/c-common.def \
 REGSET_H = regset.h $(BITMAP_H) hard-reg-set.h
 BASIC_BLOCK_H = basic-block.h $(PREDICT_H) $(VEC_H) $(FUNCTION_H) cfghooks.h
 GIMPLE_H = gimple.h gimple.def gsstruct.def pointer-set.h $(VEC_H) \
-	$(GGC_H) $(BASIC_BLOCK_H) $(TM_H) $(TARGET_H) tree-ssa-operands.h \
+	$(GGC_H) $(BASIC_BLOCK_H) $(TARGET_H) tree-ssa-operands.h \
 	tree-ssa-alias.h vecir.h
 GCOV_IO_H = gcov-io.h gcov-iov.h auto-host.h
 COVERAGE_H = coverage.h $(GCOV_IO_H)
diff --git a/gcc/gimple.h b/gcc/gimple.h
index 05f52318886..c9e835a60c5 100644
--- a/gcc/gimple.h
+++ b/gcc/gimple.h
@@ -27,8 +27,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "vecprim.h"
 #include "vecir.h"
 #include "ggc.h"
-#include "tm.h"
-#include "hard-reg-set.h"
 #include "basic-block.h"
 #include "tree-ssa-operands.h"
 #include "tree-ssa-alias.h"