Index: rtl.h
===================================================================
--- rtl.h	(revision 223875)
+++ rtl.h	(working copy)
@@ -21,14 +21,10 @@
 #define GCC_RTL_H
 
 #include "statistics.h"
-#include "machmode.h"
 #include "input.h"
-#include "real.h"
 #include "vec.h"
-#include "fixed-value.h"
 #include "alias.h"
 #include "hashtab.h"
-#include "wide-int.h"
 #include "flags.h"
 #include "is-a.h"
 
@@ -55,6 +51,8 @@
 /* Similar, but since generator files get more entries... */
 #ifdef GENERATOR_FILE
 # define NON_GENERATOR_NUM_RTX_CODE ((int) MATCH_OPERAND)
+/* Needed to compile, but won't be used. */
+#define CONST_DOUBLE_FORMAT "ww"
 #endif
 
 /* Register Transfer Language EXPRESSIONS CODE CLASSES */
@@ -409,8 +407,10 @@
     HOST_WIDE_INT hwint[1];
     struct reg_info reg;
     struct block_symbol block_sym;
+#ifndef GENERATOR_FILE
     struct real_value rv;
     struct fixed_value fv;
+#endif
     struct hwivec_def hwiv;
   } GTY ((special ("rtx_def"), desc ("GET_CODE (&%0)"))) u;
 };
@@ -2056,6 +2056,7 @@
    integer constants, this should go away and then just pass an rtx in.  */
 typedef std::pair <rtx, machine_mode> rtx_mode_t;
 
+#ifndef GENERATOR_FILE
 namespace wi
 {
   template <>
@@ -2138,6 +2139,7 @@
 {
   return max_value (GET_MODE_PRECISION (mode), sgn);
 }
+#endif /* GENERATOR_FILE */
 
 extern void init_rtlanal (void);
 extern int rtx_cost (rtx, enum rtx_code, int, bool);