diff --git a/ChangeLog b/ChangeLog
index 90a002a3..c406deca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -113,6 +113,7 @@ CVS code -
 	  Change the openfilestruct structure accordingly in order to
 	  handle this. (DLR)
 	- Convert some ints with predefined boundaries to enums. (DLR)
+	- Include config.h only if HAVE_CONFIG_H. (Jordi)
 - cut.c:
   cut_marked_segment()
 	- Respect concatenate_cut, as we need to use it if we do a
diff --git a/src/color.c b/src/color.c
index 3b60b6cf..fc87958c 100644
--- a/src/color.c
+++ b/src/color.c
@@ -19,7 +19,9 @@
  *                                                                        *
  **************************************************************************/
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/cut.c b/src/cut.c
index 573d209b..3a7a8ab2 100644
--- a/src/cut.c
+++ b/src/cut.c
@@ -19,7 +19,9 @@
  *                                                                        *
  **************************************************************************/
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/files.c b/src/files.c
index ed37ac3c..7a32388a 100644
--- a/src/files.c
+++ b/src/files.c
@@ -19,7 +19,9 @@
  *                                                                        *
  **************************************************************************/
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/global.c b/src/global.c
index 19413841..580d2e35 100644
--- a/src/global.c
+++ b/src/global.c
@@ -19,7 +19,9 @@
  *                                                                        *
  **************************************************************************/
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <assert.h>
diff --git a/src/move.c b/src/move.c
index c3130984..82b5abbe 100644
--- a/src/move.c
+++ b/src/move.c
@@ -19,7 +19,9 @@
  *                                                                        *
  **************************************************************************/
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/nano.c b/src/nano.c
index 2289b2eb..01f78d64 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -19,7 +19,9 @@
  *                                                                        *
  **************************************************************************/
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/rcfile.c b/src/rcfile.c
index f5130105..8f1780cb 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -19,7 +19,9 @@
  *                                                                        *
  **************************************************************************/
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/src/search.c b/src/search.c
index 8cfa0de8..e9ab3887 100644
--- a/src/search.c
+++ b/src/search.c
@@ -19,7 +19,9 @@
  *                                                                        *
  **************************************************************************/
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/utils.c b/src/utils.c
index 22b852e8..7b5c1045 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -19,7 +19,9 @@
  *                                                                        *
  **************************************************************************/
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/winio.c b/src/winio.c
index ee55a6e4..7c8be144 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -19,7 +19,9 @@
  *                                                                        *
  **************************************************************************/
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdarg.h>
 #include <string.h>