4 files changed, 4 insertions, 22 deletions
diff --git a/gcc/fixinc/fixlib.h b/gcc/fixinc/fixlib.h
index 6bcc6e2c666..88f396998b3 100644
--- a/gcc/fixinc/fixlib.h
+++ b/gcc/fixinc/fixlib.h
@@ -25,10 +25,10 @@ Boston, MA 02111-1307, USA.  */
 #ifndef GCC_FIXLIB_H
 #define GCC_FIXLIB_H
 
-#include "auto-host.h"
-#include "ansidecl.h"
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 
 #include "gnu-regex.h"
 #include "machname.h"
diff --git a/gcc/fixinc/procopen.c b/gcc/fixinc/procopen.c
index 98f1226ca5d..a8b5ca11075 100644
--- a/gcc/fixinc/procopen.c
+++ b/gcc/fixinc/procopen.c
@@ -45,12 +45,9 @@
  * choice whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.
  */
-#include "auto-host.h"
-#include "ansidecl.h"
-#include "system.h"
 
-#include "server.h"
 #include "fixlib.h"
+#include "server.h"
 
 STATIC const char* def_args[] =
 { (char *) NULL, (char *) NULL };
diff --git a/gcc/fixinc/server.c b/gcc/fixinc/server.c
index e58a09fa3ab..842a32181ef 100644
--- a/gcc/fixinc/server.c
+++ b/gcc/fixinc/server.c
@@ -45,18 +45,10 @@
  * choice whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.
  */
-#include "auto-host.h"
-
-#include "ansidecl.h"
-#include "system.h"
-#include <signal.h>
 
+#include "fixlib.h"
 #include "server.h"
 
-#if !defined(volatile) && !defined(HAVE_VOLATILE)
-# define volatile
-#endif
-
 STATIC volatile enum t_bool read_pipe_timeout;
 STATIC pid_t server_master_pid = NOPROCESS;
 
diff --git a/gcc/fixinc/server.h b/gcc/fixinc/server.h
index c27a51eb493..27c53d7a0b0 100644
--- a/gcc/fixinc/server.h
+++ b/gcc/fixinc/server.h
@@ -49,13 +49,6 @@
 #ifndef GCC_SERVER_H
 #define GCC_SERVER_H
 
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include "fixlib.h"
-
 /*
  *  Dual pipe opening of a child process
  */