diff --git a/projects/Windows/VC10/src/curlsrc.tmpl b/projects/Windows/VC10/src/curlsrc.tmpl
index 37f6ab8d7..1e8e4c2eb 100644
--- a/projects/Windows/VC10/src/curlsrc.tmpl
+++ b/projects/Windows/VC10/src/curlsrc.tmpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32">
@@ -2443,9 +2443,9 @@ CURL_SRC_C_FILES
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\lib\config-win32.h" />
+    <ClInclude Include="..\..\..\..\lib\curl_setup.h" />
     <ClInclude Include="..\..\..\..\lib\nonblock.h" />
     <ClInclude Include="..\..\..\..\lib\rawstr.h" />
-    <ClInclude Include="..\..\..\..\lib\setup.h" />
     <ClInclude Include="..\..\..\..\lib\strtoofft.h" />
     <ClInclude Include="..\..\..\..\lib\warnless.h" />
 CURL_SRC_H_FILES
diff --git a/projects/Windows/VC11/src/curlsrc.tmpl b/projects/Windows/VC11/src/curlsrc.tmpl
index bbaf1f355..6e6a56572 100644
--- a/projects/Windows/VC11/src/curlsrc.tmpl
+++ b/projects/Windows/VC11/src/curlsrc.tmpl
@@ -2483,9 +2483,9 @@ CURL_SRC_C_FILES
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\lib\config-win32.h" />
+    <ClInclude Include="..\..\..\..\lib\curl_setup.h" />
     <ClInclude Include="..\..\..\..\lib\nonblock.h" />
     <ClInclude Include="..\..\..\..\lib\rawstr.h" />
-    <ClInclude Include="..\..\..\..\lib\setup.h" />
     <ClInclude Include="..\..\..\..\lib\strtoofft.h" />
     <ClInclude Include="..\..\..\..\lib\warnless.h" />
 CURL_SRC_H_FILES
diff --git a/projects/Windows/VC12/src/curlsrc.tmpl b/projects/Windows/VC12/src/curlsrc.tmpl
index c8063ad97..8949f5ea1 100644
--- a/projects/Windows/VC12/src/curlsrc.tmpl
+++ b/projects/Windows/VC12/src/curlsrc.tmpl
@@ -2483,9 +2483,9 @@ CURL_SRC_C_FILES
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\lib\config-win32.h" />
+    <ClInclude Include="..\..\..\..\lib\curl_setup.h" />
     <ClInclude Include="..\..\..\..\lib\nonblock.h" />
     <ClInclude Include="..\..\..\..\lib\rawstr.h" />
-    <ClInclude Include="..\..\..\..\lib\setup.h" />
     <ClInclude Include="..\..\..\..\lib\strtoofft.h" />
     <ClInclude Include="..\..\..\..\lib\warnless.h" />
 CURL_SRC_H_FILES
diff --git a/projects/Windows/VC6/src/curlsrc.tmpl b/projects/Windows/VC6/src/curlsrc.tmpl
index a7cc2fbb8..e2f1e222b 100644
--- a/projects/Windows/VC6/src/curlsrc.tmpl
+++ b/projects/Windows/VC6/src/curlsrc.tmpl
@@ -596,6 +596,10 @@ SOURCE="..\..\..\..\lib\config-win32.h"
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\..\lib\curl_setup.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\..\lib\nonblock.h
 # End Source File
 # Begin Source File
@@ -604,10 +608,6 @@ SOURCE=..\..\..\..\lib\rawstr.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\lib\setup.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\lib\strtoofft.h
 # End Source File
 # Begin Source File
diff --git a/projects/Windows/VC7.1/src/curlsrc.tmpl b/projects/Windows/VC7.1/src/curlsrc.tmpl
index fe308f1a0..98d0c8396 100644
--- a/projects/Windows/VC7.1/src/curlsrc.tmpl
+++ b/projects/Windows/VC7.1/src/curlsrc.tmpl
@@ -1237,15 +1237,15 @@ CURL_SRC_C_FILES
 			<File
 				RelativePath="..\..\..\..\lib\config-win32.h">
 			</File>
+			<File
+				RelativePath="..\..\..\..\lib\curl_setup.h">
+			</File>
 			<File
 				RelativePath="..\..\..\..\lib\nonblock.h">
 			</File>
 			<File
 				RelativePath="..\..\..\..\lib\rawstr.h">
 			</File>
-			<File
-				RelativePath="..\..\..\..\lib\setup.h">
-			</File>
 			<File
 				RelativePath="..\..\..\..\lib\strtoofft.h">
 			</File>
diff --git a/projects/Windows/VC7/src/curlsrc.tmpl b/projects/Windows/VC7/src/curlsrc.tmpl
index 189179a38..cb538ef0c 100644
--- a/projects/Windows/VC7/src/curlsrc.tmpl
+++ b/projects/Windows/VC7/src/curlsrc.tmpl
@@ -1115,15 +1115,15 @@ CURL_SRC_C_FILES
 			<File
 				RelativePath="..\..\..\..\lib\config-win32.h">
 			</File>
+			<File
+				RelativePath="..\..\..\..\lib\curl_setup.h">
+			</File>
 			<File
 				RelativePath="..\..\..\..\lib\nonblock.h">
 			</File>
 			<File
 				RelativePath="..\..\..\..\lib\rawstr.h">
 			</File>
-			<File
-				RelativePath="..\..\..\..\lib\setup.h">
-			</File>
 			<File
 				RelativePath="..\..\..\..\lib\strtoofft.h">
 			</File>
diff --git a/projects/Windows/VC8/src/curlsrc.tmpl b/projects/Windows/VC8/src/curlsrc.tmpl
index d2906e5a5..78a2861d9 100644
--- a/projects/Windows/VC8/src/curlsrc.tmpl
+++ b/projects/Windows/VC8/src/curlsrc.tmpl
@@ -3789,6 +3789,10 @@ CURL_SRC_C_FILES
 				RelativePath="..\..\..\..\lib\config-win32.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\lib\curl_setup.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\lib\nonblock.h"
 				>
@@ -3797,10 +3801,6 @@ CURL_SRC_C_FILES
 				RelativePath="..\..\..\..\lib\rawstr.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\..\lib\setup.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\..\lib\strtoofft.h"
 				>
diff --git a/projects/Windows/VC9/src/curlsrc.tmpl b/projects/Windows/VC9/src/curlsrc.tmpl
index 8eef8db0c..5b11ab596 100644
--- a/projects/Windows/VC9/src/curlsrc.tmpl
+++ b/projects/Windows/VC9/src/curlsrc.tmpl
@@ -3750,6 +3750,10 @@ CURL_SRC_C_FILES
 				RelativePath="..\..\..\..\lib\config-win32.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\lib\curl_setup.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\lib\nonblock.h"
 				>
@@ -3758,10 +3762,6 @@ CURL_SRC_C_FILES
 				RelativePath="..\..\..\..\lib\rawstr.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\..\lib\setup.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\..\lib\strtoofft.h"
 				>
diff --git a/src/Makefile.inc b/src/Makefile.inc
index 674356a7e..64d55ecf9 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -17,7 +17,7 @@ CURLX_CFILES = \
 	../lib/warnless.c
 
 CURLX_HFILES = \
-	../lib/setup.h \
+	../lib/curl_setup.h \
 	../lib/strtoofft.h \
 	../lib/strdup.h \
 	../lib/rawstr.h \