diff --git a/windows/ddk_build/sources b/windows/ddk_build/sources
index 648466c..3314465 100644
--- a/windows/ddk_build/sources
+++ b/windows/ddk_build/sources
@@ -12,8 +12,8 @@ TARGETLIBS=$(SDK_LIB_PATH)\hid.lib \
 
 USE_MSVCRT=1
 
-INCLUDES=
-SOURCES= hid.cpp \
+INCLUDES= ..\..\hidapi
+SOURCES= ..\hid.cpp \
 
 
 TARGET_DESTINATION=retail
diff --git a/windows/hidapi.sln b/windows/hidapi.sln
index 6a01645..d45c397 100644
--- a/windows/hidapi.sln
+++ b/windows/hidapi.sln
@@ -3,6 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidapi", "hidapi.vcproj", "{A107C21C-418A-4697-BB10-20C3AA60E2E4}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidtest", "hidtest.vcproj", "{23E9FF6A-49D1-4993-B2B5-BBB992C6C712}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A107C21C-418A-4697-BB10-20C3AA60E2E4} = {A107C21C-418A-4697-BB10-20C3AA60E2E4}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -13,6 +18,10 @@ Global
 		{A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug|Win32.Build.0 = Debug|Win32
 		{A107C21C-418A-4697-BB10-20C3AA60E2E4}.Release|Win32.ActiveCfg = Release|Win32
 		{A107C21C-418A-4697-BB10-20C3AA60E2E4}.Release|Win32.Build.0 = Release|Win32
+		{23E9FF6A-49D1-4993-B2B5-BBB992C6C712}.Debug|Win32.ActiveCfg = Debug|Win32
+		{23E9FF6A-49D1-4993-B2B5-BBB992C6C712}.Debug|Win32.Build.0 = Debug|Win32
+		{23E9FF6A-49D1-4993-B2B5-BBB992C6C712}.Release|Win32.ActiveCfg = Release|Win32
+		{23E9FF6A-49D1-4993-B2B5-BBB992C6C712}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/windows/hidtest.vcproj b/windows/hidtest.vcproj
index ea3ab86..db64f96 100644
--- a/windows/hidtest.vcproj
+++ b/windows/hidtest.vcproj
@@ -85,7 +85,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copying hidapi.dll to the local direcotry."
-				CommandLine="xcopy /Y /F /R ..\windows\Debug\*.dll .\"
+				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
@@ -161,7 +161,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copying hidapi.dll to the local direcotry."
-				CommandLine="xcopy /Y /F /R ..\windows\Release\*.dll .\"
+				CommandLine=""
 			/>
 		</Configuration>
 	</Configurations>
@@ -174,7 +174,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\hidtest.cpp"
+				RelativePath="..\hidtest\hidtest.cpp"
 				>
 			</File>
 		</Filter>