diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d6c7d383db68..35e1198c591e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-12  Richard Biener  <rguenther@suse.de>
+
+	PR bootstrap/63819
+	* hash-table.h: Include ggc.h also for generator programs.
+	* genmatch.c (ggc_internal_cleared_alloc): Properly define
+	using MEM_STAT_DECL instead of CXX_MEM_STAT_INFO.
+
 2014-11-12  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
 	PR tree-optimization/63761
diff --git a/gcc/genmatch.c b/gcc/genmatch.c
index 723de193ad5b..234b1a7987cc 100644
--- a/gcc/genmatch.c
+++ b/gcc/genmatch.c
@@ -37,8 +37,7 @@ along with GCC; see the file COPYING3.  If not see
 
 /* Stubs for GGC referenced through instantiations triggered by hash-map.  */
 void *ggc_internal_cleared_alloc (size_t, void (*)(void *),
-				  size_t, size_t
-				  CXX_MEM_STAT_INFO)
+				  size_t, size_t MEM_STAT_DECL)
 {
   return NULL;
 }
diff --git a/gcc/hash-table.h b/gcc/hash-table.h
index 6df32a2e1aa5..2493f2e983a2 100644
--- a/gcc/hash-table.h
+++ b/gcc/hash-table.h
@@ -196,14 +196,7 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef TYPED_HASHTAB_H
 #define TYPED_HASHTAB_H
 
-#ifndef GENERATOR_FILE
 #include "ggc.h"
-#else
-template <typename T>
-T *ggc_cleared_vec_alloc (size_t);
-template <typename T>
-T *ggc_alloc ();
-#endif
 #include "hashtab.h"
 #include <new>