diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66d5a9f6a..eacb7d49d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -375,7 +375,7 @@ if(USE_WIIUSE)
         if(WIIUSE_BUILD)
             add_subdirectory("${PROJECT_SOURCE_DIR}/lib/wiiuse")
         endif()
-        include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/wiiuse/src")
+        include_directories(BEFORE "${PROJECT_SOURCE_DIR}/lib/wiiuse/src/include")
         set(WIIUSE_LIBRARIES "wiiuse" "bluetooth")
     endif()
 endif()
diff --git a/lib/wiiuse/ParseVersion.cmake b/lib/wiiuse/ParseVersion.cmake
index 96873cc35..c0b9e4936 100644
--- a/lib/wiiuse/ParseVersion.cmake
+++ b/lib/wiiuse/ParseVersion.cmake
@@ -1,4 +1,4 @@
-set(_version_file "${CMAKE_CURRENT_SOURCE_DIR}/src/wiiuse.h")
+set(_version_file "${CMAKE_CURRENT_SOURCE_DIR}/src/include/wiiuse.h")
 if(EXISTS "${_version_file}")
 	file(READ "${_version_file}" _version_contents)
 endif()
diff --git a/lib/wiiuse/src/CMakeLists.txt b/lib/wiiuse/src/CMakeLists.txt
index 87571fe41..9bec8a0dd 100644
--- a/lib/wiiuse/src/CMakeLists.txt
+++ b/lib/wiiuse/src/CMakeLists.txt
@@ -2,6 +2,9 @@ if(NOT MSVC)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
 endif()
 
+# Modified for STK to avoid compiler warnings with MinGW
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+
 set(SOURCES
 	classic.c
 	dynamics.c
@@ -28,7 +31,7 @@ set(SOURCES
 	wiiuse_internal.h
 	wiiboard.h)
 set(API
-	wiiuse.h)
+	include/wiiuse.h)
 
 if(WIN32)
 	list(APPEND SOURCES os_win.c)
@@ -51,7 +54,7 @@ else()
 endif()
 
 if(MSVC)
-	list(APPEND API wiiuse_msvcstdint.h)
+	list(APPEND API include/wiiuse_msvcstdint.h)
 endif()
 
 add_definitions(-DWIIUSE_COMPILE_LIB)
diff --git a/lib/wiiuse/src/wiiuse.h b/lib/wiiuse/src/include/wiiuse.h
similarity index 100%
rename from lib/wiiuse/src/wiiuse.h
rename to lib/wiiuse/src/include/wiiuse.h
diff --git a/lib/wiiuse/src/wiiuse_msvcstdint.h b/lib/wiiuse/src/include/wiiuse_msvcstdint.h
similarity index 100%
rename from lib/wiiuse/src/wiiuse_msvcstdint.h
rename to lib/wiiuse/src/include/wiiuse_msvcstdint.h