diff --git a/CHANGES b/CHANGES
index b5bd740ef..61c7ac177 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,8 @@ Yang Tse (14 Jul 2008)
 
 - Removed inclusion of remaining system header files from configuration files.
 
+- Move _REENTRANT definition earlier in lib/setup.h
+
 Yang Tse (11 Jul 2008)
 - Added missing multiple header inclusion prevention definition for header
   file content_encoding.h
diff --git a/lib/setup.h b/lib/setup.h
index e174e18e4..d68782366 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -73,6 +73,16 @@
 
 #endif /* HAVE_CONFIG_H */
 
+/*
+ * Solaris needs _REENTRANT set for a few function prototypes and
+ * things to appear in the system header files. Unixware needs it
+ * to build proper reentrant code. Others may also need it.
+ */
+
+#ifndef _REENTRANT
+#  define _REENTRANT
+#endif
+
 /*
  * Disable other protocols when http is the only one desired.
  */
@@ -157,14 +167,6 @@
 #define FORMAT_OFF_TU "lu" /* thus unsigned version */
 #endif /* SIZEOF_CURL_OFF_T */
 
-#ifndef _REENTRANT
-/* Solaris needs _REENTRANT set for a few function prototypes and things to
-   appear in the #include files. We need to #define it before all #include
-   files. Unixware needs it to build proper reentrant code. Others may also
-   need it. */
-#define _REENTRANT
-#endif
-
 #ifdef HAVE_EXTRA_STRICMP_H
 #  include <extra/stricmp.h>
 #endif