diff --git a/Makefiles/Makefile.Win32 b/Makefiles/Makefile.Win32
index 87f5c8f..cef74e1 100644
--- a/Makefiles/Makefile.Win32
+++ b/Makefiles/Makefile.Win32
@@ -44,8 +44,8 @@ BITS = 64
 #
 # Path to SDL
 #
-SDL_INCLUDE_DIR = c:/tdm-gcc-64/include/SDL
-SDL_LIB_DIR = c:/tdm-gcc-64/lib
+SDL_INCLUDE_DIR = C:/mingw-w64/x86_64-8.1.0-posix-seh-rt_v6-rev0/mingw64/include/SDL
+SDL_LIB_DIR = C:/mingw-w64/x86_64-8.1.0-posix-seh-rt_v6-rev0/mingw64/lib
 
 #
 # Toolchain
diff --git a/Makefiles/Makefile.inc b/Makefiles/Makefile.inc
index 225d116..4d48287 100644
--- a/Makefiles/Makefile.inc
+++ b/Makefiles/Makefile.inc
@@ -139,17 +139,7 @@ SRC_FILES = \
 	Src/Inputs/MultiInputSource.cpp \
 	Src/OSD/SDL/SDLInputSystem.cpp \
 	Src/OSD/Outputs.cpp \
-	Src/Sound/MPEG/amp_audio.cpp \
-	Src/Sound/MPEG/dump.cpp \
-	Src/Sound/MPEG/getbits.cpp \
-	Src/Sound/MPEG/getdata.cpp \
-	Src/Sound/MPEG/huffman.cpp \
-	Src/Sound/MPEG/layer2.cpp \
-	Src/Sound/MPEG/layer3.cpp \
-	Src/Sound/MPEG/misc2.cpp \
-	Src/Sound/MPEG/position.cpp \
-	Src/Sound/MPEG/transform.cpp \
-	Src/Sound/MPEG/util.cpp \
+	Src/Sound/MPEG/MpegAudio.cpp \
 	Src/Model3/Crypto.cpp \
 	Src/OSD/Logger.cpp \
 	Src/Util/Format.cpp \