* lra-int.h: Flatten completely.
	* lra-assigns.c: Adjust includes.
	* lra-coalesce.c: Likewise.
	* lra-constraints.c: Likewise.
	* lra-eliminations.c: Likewise.
	* lra-lives.c: Likewise.
	* lra-remat.c: Likewise.
	* lra-spills.c: Likewise.
	* lra.c: Likewise.

Index: lra-int.h
===================================================================
*** lra-int.h	(revision 225452)
--- lra-int.h	(working copy)
*************** along with GCC; see the file COPYING3.	I
*** 21,34 ****
  #ifndef GCC_LRA_INT_H
  #define GCC_LRA_INT_H
  
- #include "lra.h"
- #include "bitmap.h"
- #include "recog.h"
- #include "insn-attr.h"
- #include "insn-codes.h"
- #include "insn-config.h"
- #include "regs.h"
- 
  #define lra_assert(c) gcc_checking_assert (c)
  
  /* The parameter used to prevent infinite reloading for an insn.  Each
--- 21,26 ----
Index: lra-assigns.c
===================================================================
*** lra-assigns.c	(revision 225452)
--- lra-assigns.c	(working copy)
*************** along with GCC; see the file COPYING3.	I
*** 109,114 ****
--- 109,118 ----
  #include "ira.h"
  #include "sparseset.h"
  #include "params.h"
+ #include "lra.h"
+ #include "bitmap.h"
+ #include "insn-attr.h"
+ #include "insn-codes.h"
  #include "lra-int.h"
  
  /* Current iteration number of the pass and current iteration number
Index: lra-coalesce.c
===================================================================
*** lra-coalesce.c	(revision 225452)
--- lra-coalesce.c	(working copy)
*************** along with GCC; see the file COPYING3.	I
*** 74,79 ****
--- 74,83 ----
  #include "timevar.h"
  #include "ira.h"
  #include "alloc-pool.h"
+ #include "lra.h"
+ #include "bitmap.h"
+ #include "insn-attr.h"
+ #include "insn-codes.h"
  #include "lra-int.h"
  #include "df.h"
  
Index: lra-constraints.c
===================================================================
*** lra-constraints.c	(revision 225452)
--- lra-constraints.c	(working copy)
***************
*** 144,149 ****
--- 144,152 ----
  #include "ira.h"
  #include "rtl-error.h"
  #include "params.h"
+ #include "lra.h"
+ #include "bitmap.h"
+ #include "insn-attr.h"
  #include "lra-int.h"
  
  /* Value of LRA_CURR_RELOAD_NUM at the beginning of BB of the current
Index: lra-eliminations.c
===================================================================
*** lra-eliminations.c	(revision 225452)
--- lra-eliminations.c	(working copy)
*************** along with GCC; see the file COPYING3.	I
*** 87,92 ****
--- 87,95 ----
  #include "df.h"
  #include "ira.h"
  #include "rtl-error.h"
+ #include "lra.h"
+ #include "bitmap.h"
+ #include "insn-attr.h"
  #include "lra-int.h"
  
  /* This structure is used to record information about hard register
Index: lra-lives.c
===================================================================
*** lra-lives.c	(revision 225452)
--- lra-lives.c	(working copy)
*************** along with GCC; see the file COPYING3.	I
*** 58,63 ****
--- 58,67 ----
  #include "df.h"
  #include "ira.h"
  #include "sparseset.h"
+ #include "lra.h"
+ #include "bitmap.h"
+ #include "insn-attr.h"
+ #include "insn-codes.h"
  #include "lra-int.h"
  
  /* Program points are enumerated by numbers from range
Index: lra-remat.c
===================================================================
*** lra-remat.c	(revision 225452)
--- lra-remat.c	(working copy)
*************** along with GCC; see the file COPYING3.	I
*** 87,92 ****
--- 87,96 ----
  #include "ira.h"
  #include "sparseset.h"
  #include "params.h"
+ #include "lra.h"
+ #include "bitmap.h"
+ #include "insn-attr.h"
+ #include "insn-codes.h"
  #include "lra-int.h"
  
  /* Number of candidates for rematerialization.  */
Index: lra-spills.c
===================================================================
*** lra-spills.c	(revision 225452)
--- lra-spills.c	(working copy)
*************** along with GCC; see the file COPYING3.	I
*** 88,93 ****
--- 88,97 ----
  #include "timevar.h"
  #include "target.h"
  #include "alloc-pool.h"
+ #include "lra.h"
+ #include "bitmap.h"
+ #include "insn-attr.h"
+ #include "insn-codes.h"
  #include "lra-int.h"
  #include "ira.h"
  #include "df.h"
Index: lra.c
===================================================================
*** lra.c	(revision 225452)
--- lra.c	(working copy)
*************** along with GCC; see the file COPYING3.	I
*** 139,144 ****
--- 139,147 ----
  #include "target.h"
  #include "ira.h"
  #include "alloc-pool.h"
+ #include "lra.h"
+ #include "bitmap.h"
+ #include "insn-attr.h"
  #include "lra-int.h"
  #include "df.h"