diff --git a/bin/Resources/exchndl.dll b/bin/Resources/exchndl.dll
deleted file mode 100644
index d836a676..00000000
Binary files a/bin/Resources/exchndl.dll and /dev/null differ
diff --git a/bin/Resources/fmod.dll b/bin/Resources/fmod.dll
deleted file mode 100644
index 6b0e379d..00000000
Binary files a/bin/Resources/fmod.dll and /dev/null differ
diff --git a/bin/Resources/fmod64.dll b/bin/Resources/fmod64.dll
deleted file mode 100644
index 2a8bab28..00000000
Binary files a/bin/Resources/fmod64.dll and /dev/null differ
diff --git a/bin/Resources/fmodex.dll b/bin/Resources/fmodex.dll
deleted file mode 100644
index 875f8a26..00000000
Binary files a/bin/Resources/fmodex.dll and /dev/null differ
diff --git a/bin/Resources/fmodex64.dll b/bin/Resources/fmodex64.dll
deleted file mode 100644
index f08c0033..00000000
Binary files a/bin/Resources/fmodex64.dll and /dev/null differ
diff --git a/bin/Resources/fmodexL.dll b/bin/Resources/fmodexL.dll
deleted file mode 100644
index 1ac9e21c..00000000
Binary files a/bin/Resources/fmodexL.dll and /dev/null differ
diff --git a/bin/Resources/fmodexL64.dll b/bin/Resources/fmodexL64.dll
deleted file mode 100644
index 463628c6..00000000
Binary files a/bin/Resources/fmodexL64.dll and /dev/null differ
diff --git a/bin/Resources/libgcc_s_dw2-1.dll b/bin/Resources/libgcc_s_dw2-1.dll
deleted file mode 100644
index 19b72955..00000000
Binary files a/bin/Resources/libgcc_s_dw2-1.dll and /dev/null differ
diff --git a/bin/Resources/libgme.dll b/bin/Resources/libgme.dll
deleted file mode 100644
index ddf8b0d8..00000000
Binary files a/bin/Resources/libgme.dll and /dev/null differ
diff --git a/bin/Resources/libgme64.dll b/bin/Resources/libgme64.dll
deleted file mode 100644
index 2ba99450..00000000
Binary files a/bin/Resources/libgme64.dll and /dev/null differ
diff --git a/bin/Resources/libintl-8.dll b/bin/Resources/libintl-8.dll
deleted file mode 100644
index 9f10b6c5..00000000
Binary files a/bin/Resources/libintl-8.dll and /dev/null differ
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1be110a7..99f2beeb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -353,6 +353,7 @@ if(${SRB2_CONFIG_HAVE_ZLIB})
 	endif()
 	if(${ZLIB_FOUND})
 		set(SRB2_HAVE_ZLIB ON)
+		add_definitions(-DHAVE_ZLIB)
 	else()
 		message(WARNING "You have specified that ZLIB is available but it was not found. SRB2 may not compile correctly.")
 	endif()
diff --git a/src/sdl/CMakeLists.txt b/src/sdl/CMakeLists.txt
index 50fb7a57..a3626970 100644
--- a/src/sdl/CMakeLists.txt
+++ b/src/sdl/CMakeLists.txt
@@ -274,17 +274,49 @@ if(${SDL2_FOUND})
 	if(${CMAKE_SYSTEM} MATCHES Windows)
 		set(win_extra_dll_list "")
 		macro(getwinlib dllname defaultname)
-			find_library(SRB2_SDL2_DLL_${dllname} "${defaultname}")
-			list(APPEND win_extra_dll_list ${SRB2_SDL2_DLL_${dllname}})
+			if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
+				if (${CMAKE_GENERATOR} STREQUAL "MinGW Makefiles")
+					if(${SRB2_SYSTEM_BITS} EQUAL 64)
+						find_library(SRB2_SDL2_DLL_${dllname} "${defaultname}"
+							HINTS ${CMAKE_SOURCE_DIR}/Bin/Resources/x86_64
+							HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2/x86_64-w64-mingw32/bin
+							HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/x86_64-w64-mingw32/bin
+						)
+					else()
+						find_library(SRB2_SDL2_DLL_${dllname} "${defaultname}"
+							HINTS ${CMAKE_SOURCE_DIR}/Bin/Resources/i686
+							HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2/i686-w64-mingw32/bin
+							HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/i686-w64-mingw32/bin
+						)
+					endif()
+				else()
+					if(${SRB2_SYSTEM_BITS} EQUAL 64)
+						find_library(SRB2_SDL2_DLL_${dllname} "${defaultname}"
+							HINTS ${CMAKE_SOURCE_DIR}/Bin/Resources/x86_64
+							HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2/lib/x64
+							HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/lib/x64
+						)
+					else()
+						find_library(SRB2_SDL2_DLL_${dllname} "${defaultname}"
+							HINTS ${CMAKE_SOURCE_DIR}/Bin/Resources/i686
+							HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2/lib/x86
+							HINTS ${CMAKE_SOURCE_DIR}/libs/SDL2_mixer/lib/x86
+						)
+					endif()
+				endif()
+
+				list(APPEND win_extra_dll_list ${SRB2_SDL2_DLL_${dllname}})
+			else()
+				find_library(SRB2_SDL2_DLL_${dllname} "${defaultname}")
+				list(APPEND win_extra_dll_list ${SRB2_SDL2_DLL_${dllname}})
+	endif()
 		endmacro()
 		getwinlib(SDL2 "SDL2.dll")
 		if(${SRB2_CONFIG_SDL2_USEMIXER})
 			getwinlib(SDL2_mixer "SDL2_mixer.dll")
-			getwinlib(libmikmod-2 "libmikmod-2.dll")
 			getwinlib(libogg_0 "libogg-0.dll")
 			getwinlib(libvorbis_0 "libvorbis-0.dll")
 			getwinlib(libvorbisfile_3 "libvorbisfile-3.dll")
-			getwinlib(smpeg2 "smpeg2.dll")
 		endif()
 		if(${SRB2_CONFIG_HAVE_GME})
 			getwinlib(libgme "libgme.dll")