diff --git a/visualtest/include/SDL_visualtest_process.h b/visualtest/include/SDL_visualtest_process.h
index 632e0ac27..26ce5a098 100644
--- a/visualtest/include/SDL_visualtest_process.h
+++ b/visualtest/include/SDL_visualtest_process.h
@@ -8,8 +8,8 @@
 #include <SDL_platform.h>
 
 #if defined(__WIN32__)
-#include <Windows.h>
-#include <Shlwapi.h>
+#include <windows.h>
+#include <shlwapi.h>
 #elif defined(__LINUX__)
 #include <unistd.h>
 #else
diff --git a/visualtest/src/linux/linux_process.c b/visualtest/src/linux/linux_process.c
index d6e7f75b7..d81a32eb7 100644
--- a/visualtest/src/linux/linux_process.c
+++ b/visualtest/src/linux/linux_process.c
@@ -8,16 +8,16 @@
 
 #include <SDL.h>
 #include <SDL_test.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <errno.h>
 
 #include "SDL_visualtest_process.h"
 #include "SDL_visualtest_harness_argparser.h"
 #include "SDL_visualtest_parsehelper.h"
 
 #if defined(__LINUX__)
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <errno.h>
 
 static void
 LogLastError(char* str)
diff --git a/visualtest/src/windows/windows_process.c b/visualtest/src/windows/windows_process.c
index c13118d93..346d60582 100644
--- a/visualtest/src/windows/windows_process.c
+++ b/visualtest/src/windows/windows_process.c
@@ -174,7 +174,7 @@ CloseWindowCallback(HWND hwnd, LPARAM lparam)
     GetWindowThreadProcessId(hwnd, &pid);
     if(pid == pinfo->pi.dwProcessId)
     {
-        DWORD result;
+        DWORD_PTR result;
         if(!SendMessageTimeout(hwnd, WM_CLOSE, 0, 0, SMTO_BLOCK,
                                1000, &result))
         {