diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ab37708..fc4c5055 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -681,7 +681,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang AND NOT MSVC
     endif()
 
     # Common flags.
-    set(MY_C_FLAGS -pipe -Wno-unused-command-line-argument -Wformat -Wformat-security -feliminate-unused-debug-types)
+    set(MY_C_FLAGS -pipe -Wformat -Wformat-security -feliminate-unused-debug-types)
 
     include(CheckCXXCompilerFlag)
 
@@ -1184,7 +1184,6 @@ set(
 include_directories(
     ${ZLIB_INCLUDE_DIR}
     fex
-    ${SDL2_INCLUDE_DIR}
     third_party/include
     third_party/include/stb
 )
@@ -1215,6 +1214,7 @@ if(NOT TRANSLATIONS_ONLY)
         ${HDR_STB_IMAGE}
     )
     add_dependencies(vbamcore generate)
+    target_include_directories(vbamcore PUBLIC ${SDL2_INCLUDE_DIRS})
 endif()
 
 if((NOT TRANSLATIONS_ONLY) AND ENABLE_SDL)
diff --git a/src/common/SoundSDL.h b/src/common/SoundSDL.h
index d6f7ec0a..b355c36a 100644
--- a/src/common/SoundSDL.h
+++ b/src/common/SoundSDL.h
@@ -18,11 +18,11 @@
 #ifndef __VBA_SOUND_SDL_H__
 #define __VBA_SOUND_SDL_H__
 
+#include <SDL.h>
+
 #include "ringbuffer.h"
 #include "SoundDriver.h"
 
-#include "SDL.h"
-
 class SoundSDL : public SoundDriver {
 public:
         SoundSDL();