diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5822bad..e7fba32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -277,3 +277,4 @@ target_include_directories(${EXECUTABLE_NAME} PRIVATE ${ZLIB_INCLUDE_DIRS})
 
 target_link_libraries(${EXECUTABLE_NAME} ${SDL2_LIBRARIES})
 target_include_directories(${EXECUTABLE_NAME} PRIVATE ${SDL2_INCLUDE_DIRS})
+add_definitions(-DSDL_MAIN_HANDLED)
diff --git a/src/dsound_compat.h b/src/dsound_compat.h
index e484d60..b24a4b2 100644
--- a/src/dsound_compat.h
+++ b/src/dsound_compat.h
@@ -9,6 +9,7 @@
 #include <windows.h>
 
 #include <mmreg.h>
+#include <mmsystem.h>
 
 #define DIRECTSOUND_VERSION 0x0300
 #include <dsound.h>
diff --git a/src/file_find.cc b/src/file_find.cc
index 8ac3497..220e81b 100644
--- a/src/file_find.cc
+++ b/src/file_find.cc
@@ -83,7 +83,7 @@ bool fileFindNext(DirectoryFileFindData* findData)
 // 0x4E63CC
 bool findFindClose(DirectoryFileFindData* findData)
 {
-#if defined(_MSC_VER)
+#if defined(_WIN32)
     FindClose(findData->hFind);
 #else
     if (findData->dir != NULL) {