5 files changed, 7 insertions, 7 deletions
diff --git a/testprogs/win32/spoolss/Makefile b/testprogs/win32/spoolss/Makefile
index 8c9d71683e..5e984d43b1 100644
--- a/testprogs/win32/spoolss/Makefile
+++ b/testprogs/win32/spoolss/Makefile
@@ -3,7 +3,7 @@ LIBS = kernel32.lib gdi32.lib user32.lib shell32.lib \
 	advapi32.lib ole32.lib ws2_32.lib rpcrt4.lib
 WINSPOOL_LIBS = winspool.lib
 
-all: spoolss.exe
+all: testspoolss.exe
 
 .cpp.obj:
 	cl /c $(CFLAGS) $*.cpp
@@ -32,9 +32,9 @@ torture.obj: torture.c
 # binaries
 ###############################
 
-spoolss.obj: spoolss.c
+testspoolss.obj: testspoolss.c
 
-spoolss.exe: spoolss.obj printlib.obj error.obj torture.obj
-	cl $(CFLAGS) /Fe$@ spoolss.obj printlib.obj error.obj torture.obj \
+testspoolss.exe: testspoolss.obj printlib.obj error.obj torture.obj
+	cl $(CFLAGS) /Fe$@ testspoolss.obj printlib.obj error.obj torture.obj \
 	/link /incremental:no /subsystem:console $(LIBS) $(WINSPOOL_LIBS)
 
diff --git a/testprogs/win32/spoolss/error.c b/testprogs/win32/spoolss/error.c
index e5ad661dd4..3f965949e4 100644
--- a/testprogs/win32/spoolss/error.c
+++ b/testprogs/win32/spoolss/error.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "spoolss.h"
+#include "testspoolss.h"
 
 const char *errstr(DWORD error)
 {
diff --git a/testprogs/win32/spoolss/spoolss.c b/testprogs/win32/spoolss/testspoolss.c
index d98aee2e73..7aa3703f89 100644
--- a/testprogs/win32/spoolss/spoolss.c
+++ b/testprogs/win32/spoolss/testspoolss.c
@@ -21,7 +21,7 @@
 /****************************************************************************
 ****************************************************************************/
 
-#include "spoolss.h"
+#include "testspoolss.h"
 #include "string.h"
 #include "torture.h"
 
diff --git a/testprogs/win32/spoolss/spoolss.h b/testprogs/win32/spoolss/testspoolss.h
index f025fccb3f..f025fccb3f 100644
--- a/testprogs/win32/spoolss/spoolss.h
+++ b/testprogs/win32/spoolss/testspoolss.h
diff --git a/testprogs/win32/spoolss/torture.c b/testprogs/win32/spoolss/torture.c
index 27872a6ccc..ff2824a737 100644
--- a/testprogs/win32/spoolss/torture.c
+++ b/testprogs/win32/spoolss/torture.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "spoolss.h"
+#include "testspoolss.h"
 #include "torture.h"
 
 /****************************************************************************