diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 00aa275e3fbe..ae75fe0469b8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-30  Mingjie Xing  <mingjie.xing@gmail.com>
+
+	* gcc-plugin.h: Include coretypes.h.
+	* Makefile.in (FUNCTION_H): Add hard-reg-set.h.
+
 2010-11-30  Laurynas Biveinis  <laurynas.biveinis@gmail.com>
 
 	* ggc-zone.c (ggc_pch_read): Fix conditional compilation.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 97ddf4690bdd..3a25cd8483bf 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -907,7 +907,7 @@ ALIAS_H = alias.h coretypes.h
 EMIT_RTL_H = emit-rtl.h
 FLAGS_H = flags.h coretypes.h flag-types.h $(OPTIONS_H)
 OPTIONS_H = options.h flag-types.h $(OPTIONS_H_EXTRA)
-FUNCTION_H = function.h $(TREE_H) $(HASHTAB_H) vecprim.h $(TM_H)
+FUNCTION_H = function.h $(TREE_H) $(HASHTAB_H) vecprim.h $(TM_H) hard-reg-set.h
 EXPR_H = expr.h insn-config.h $(FUNCTION_H) $(RTL_H) $(FLAGS_H) $(TREE_H) $(MACHMODE_H) $(EMIT_RTL_H)
 OPTABS_H = optabs.h insn-codes.h
 REGS_H = regs.h $(MACHMODE_H) hard-reg-set.h
diff --git a/gcc/gcc-plugin.h b/gcc/gcc-plugin.h
index 7573fa28d7c8..b98bcb67f6d3 100644
--- a/gcc/gcc-plugin.h
+++ b/gcc/gcc-plugin.h
@@ -26,6 +26,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
 #include "highlev-plugin-common.h"
 #include "hashtab.h"