1 files changed, 6 insertions, 10 deletions
diff --git a/gcc/fixinc/server.c b/gcc/fixinc/server.c
index e803e0a29ce..40662c46572 100644
--- a/gcc/fixinc/server.c
+++ b/gcc/fixinc/server.c
@@ -46,17 +46,9 @@
  * If you do not wish that, delete this exception notice.
  */
 #include "auto-host.h"
-
-#include <sys/types.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <errno.h>
+#include "gansidecl.h"
+#include "system.h"
 #include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/param.h>
 
 #include "server.h"
 
@@ -86,6 +78,10 @@
 #define NUL '\0'
 #endif
 
+#if !defined(volatile) && !defined(HAVE_VOLATILE)
+# define volatile
+#endif
+
 STATIC volatile bool read_pipe_timeout;
 
 static t_pchar def_args[] =