diff --git a/lib/setup.h b/lib/setup.h
index 66e7a8670a019581d59425fccf94d72e4a91e13d..54915ad4ee4ce667789c91fd1382c18d77dd81d6 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -38,14 +38,13 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
+#include "config.h" /* the configure script results */
+#endif
 
 #ifdef VMS
+/* hand-modified VMS config.h! */
 #include "config-vms.h"
-#else
-#include "config.h" /* the configure script results */
 #endif
-
-#else
 #ifdef WIN32
 /* hand-modified win32 config.h! */
 #include "config-win32.h"
@@ -55,11 +54,10 @@
 #include "config-mac.h"
 #endif
 #ifdef AMIGA
+/* hand-modified AmigaOS config.h! */
 #include "amigaos.h"
 #endif
 
-#endif
-
 #ifndef TRUE
 #define TRUE 1
 #endif