diff --git a/msvc/ecl/config.h.msvc6 b/msvc/ecl/config.h.msvc6
index 322ac04b6..d3f0b3052 100644
--- a/msvc/ecl/config.h.msvc6
+++ b/msvc/ecl/config.h.msvc6
@@ -78,9 +78,18 @@
 /* Support for Unicode strings */
 /* #undef ECL_UNICODE */
 
+/* Allow STREAM operations to work on arbitrary objects			*/
+#define ECL_CLOS_STREAMS 1
+
 /* Stack grows downwards						*/
 #define ECL_DOWN_STACK 1
 
+/* We have non-portable implementation of FFI calls			*/
+#define ECL_DYNAMIC_FFI 1
+
+/* We use hierarchical package names, like in Allegro CL                */
+#define ECL_RELATIVE_PACKAGE_NAMES 1
+
 /* Use mprotect for fast interrupt dispatch				*/
 /* #undef ECL_USE_MPROTECT */
 
@@ -214,21 +223,12 @@ typedef unsigned int uint32_t;
 /* Undefine this if you do not want ECL to check for circular lists	*/
 #define ECL_SAFE
 
-/* Allow STREAM operations to work on arbitrary objects			*/
-#define ECL_CLOS_STREAMS 1
-
 /* Use CMU Common-Lisp's FORMAT routine					*/
 #define ECL_CMU_FORMAT 1
 
 /* Bytecodes and arguments are 8 and 16 bits large, respectively	*/
 /* #undef ECL_SMALL_BYTECODES */
 
-/* We have non-portable implementation of FFI calls			*/
-#define ECL_DYNAMIC_FFI 1
-
-/* We use hierarchical package names, like in Allegro CL                */
-#define ECL_RELATIVE_PACKAGE_NAMES 1
-
 /* Assembler implementation of APPLY and friends			*/
 /* #undef ECL_ASM_APPLY */
 
diff --git a/src/h/config.h.in b/src/h/config.h.in
index e2742410a..1e51c72af 100644
--- a/src/h/config.h.in
+++ b/src/h/config.h.in
@@ -84,9 +84,18 @@
 /* Support for Unicode strings */
 #undef ECL_UNICODE
 
+/* Allow STREAM operations to work on arbitrary objects			*/
+#undef ECL_CLOS_STREAMS
+
 /* Stack grows downwards						*/
 #undef ECL_DOWN_STACK
 
+/* We have non-portable implementation of FFI calls			*/
+#undef ECL_DYNAMIC_FFI
+
+/* We use hierarchical package names, like in Allegro CL                */
+#undef ECL_RELATIVE_PACKAGE_NAMES
+
 /* Use mprotect for fast interrupt dispatch				*/
 #undef ECL_USE_MPROTECT
 
@@ -216,21 +225,12 @@ typedef unsigned @CL_FIXNUM_TYPE@ cl_hashkey;
 /* Undefine this if you do not want ECL to check for circular lists	*/
 #define ECL_SAFE
 
-/* Allow STREAM operations to work on arbitrary objects			*/
-#undef ECL_CLOS_STREAMS
-
 /* Use CMU Common-Lisp's FORMAT routine					*/
 #undef ECL_CMU_FORMAT
 
 /* Bytecodes and arguments are 8 and 16 bits large, respectively	*/
 #undef ECL_SMALL_BYTECODES
 
-/* We have non-portable implementation of FFI calls			*/
-#undef ECL_DYNAMIC_FFI
-
-/* We use hierarchical package names, like in Allegro CL                */
-#undef ECL_RELATIVE_PACKAGE_NAMES
-
 /* Assembler implementation of APPLY and friends			*/
 #undef ECL_ASM_APPLY