Include <config.h>.

7 files changed, 28 insertions, 7 deletions

diff --git a/src/sysdep.c b/src/sysdep.c
index 6d0528cb2db..478d56a43a9 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -19,8 +19,10 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include "config.h"
 #include <signal.h>
 #include <setjmp.h>
 #ifdef HAVE_UNISTD_H
diff --git a/src/unexapollo.c b/src/unexapollo.c
index 4c87bfa3fe4..4a5ab60b254 100644
--- a/src/unexapollo.c
+++ b/src/unexapollo.c
@@ -20,7 +20,10 @@ Boston, MA 02111-1307, USA.  */
 
 /* Written by Leonard N. Zubkoff.  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <fcntl.h>
 
 
diff --git a/src/w32.c b/src/w32.c
index a8e4a5f37da..f6e9f765500 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -35,7 +35,11 @@ Boston, MA 02111-1307, USA.
 #include <sys/utime.h>
 
 /* must include CRT headers *before* config.h */
-#include "config.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #undef access
 #undef chdir
 #undef chmod
diff --git a/src/w32bdf.c b/src/w32bdf.c
index d2d33d72ca3..801c914d8d9 100644
--- a/src/w32bdf.c
+++ b/src/w32bdf.c
@@ -22,7 +22,11 @@ Boston, MA 02111-1307, USA.  */
    MULE for W32). */
 
 #include <windows.h>
-#include "config.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "lisp.h"
 #include "charset.h"
 #include "keyboard.h"
diff --git a/src/w32heap.c b/src/w32heap.c
index eb878a45e94..e90213a6c36 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -21,7 +21,9 @@ Boston, MA 02111-1307, USA.
    Geoff Voelker (voelker@cs.washington.edu)                         7-29-94
 */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/w32inevt.c b/src/w32inevt.c
index d2c37aa0b0b..df9e0d48a4e 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -23,7 +23,9 @@ Boston, MA 02111-1307, USA.
 */
 
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/w32proc.c b/src/w32proc.c
index 7c9aad6b0a5..735df38b8ce 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -30,7 +30,11 @@ Boston, MA 02111-1307, USA.
 #include <signal.h>
 
 /* must include CRT headers *before* config.h */
-#include "config.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #undef signal
 #undef wait
 #undef spawnve