diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 281678d8e..5b73865aa 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -44,4 +44,4 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h	\
   curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h curl_ntlm_msgs.h	\
   curl_sasl.h curl_schannel.h curl_multibyte.h curl_darwinssl.h	        \
   hostcheck.h bundles.h conncache.h curl_setup_once.h multihandle.h     \
-  post-config-vms.h
+  setup-vms.h
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index a6f9e0a83..ad83fec5f 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -40,11 +40,6 @@
 
 #include "curl_config.h"
 
-/* VMS needs some helper routines/definitions */
-#ifdef __VMS
-#  include "post-config-vms.h"
-#endif
-
 #else /* HAVE_CONFIG_H */
 
 #ifdef _WIN32_WCE
@@ -234,6 +229,14 @@
 #  include "setup-os400.h"
 #endif
 
+/*
+ * VMS setup file includes some system headers.
+ */
+
+#ifdef __VMS
+#  include "setup-vms.h"
+#endif
+
 /*
  * Include header files for windows builds before redefining anything.
  * Use this preprocessor block only to include or exclude windows.h,
diff --git a/lib/post-config-vms.h b/lib/setup-vms.h
similarity index 99%
rename from lib/post-config-vms.h
rename to lib/setup-vms.h
index 4da5b9924..4eefbba49 100644
--- a/lib/post-config-vms.h
+++ b/lib/setup-vms.h
@@ -1,5 +1,5 @@
-#ifndef HEADER_CONFIG_VMS_H
-#define HEADER_CONFIG_VMS_H
+#ifndef HEADER_CURL_SETUP_VMS_H
+#define HEADER_CURL_SETUP_VMS_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -395,4 +395,4 @@ char * unix_path;
 #endif
 #endif
 
-#endif /* HEADER_CONFIG_VMS_H */
+#endif /* HEADER_CURL_SETUP_VMS_H */