diff --git a/Makefiles/Makefile.OSX b/Makefiles/Makefile.OSX
new file mode 100644
index 0000000..e5a66cf
--- /dev/null
+++ b/Makefiles/Makefile.OSX
@@ -0,0 +1,77 @@
+##
+## Supermodel
+## A Sega Model 3 Arcade Emulator.
+## Copyright 2011-2017 Bart Trzynadlowski, Nik Henson, Ian Curtis
+##
+## This file is part of Supermodel.
+##
+## Supermodel is free software: you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free 
+## Software Foundation, either version 3 of the License, or (at your option)
+## any later version.
+##
+## Supermodel is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+## more details.
+##
+## You should have received a copy of the GNU General Public License along
+## with Supermodel.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+#
+# Makefile.OSX
+#
+# Makefile for Mac OS X systems using gcc.
+#
+
+
+###############################################################################
+# Build Options
+###############################################################################
+
+#
+# Include console-based debugger in emulator ('yes' or 'no')
+#
+ENABLE_DEBUGGER = no
+
+
+###############################################################################
+# Platform Configuration
+#
+# Edit library and include paths as needed.
+###############################################################################
+
+#
+# Toolchain
+#
+CC = gcc
+CXX = g++
+LD = gcc
+
+#
+# SDL
+#
+
+SDL_CFLAGS =
+SDL_LDFLAGS = -framework SDL -framework AGL -framework OpenGL -framework GLUT -framework Cocoa
+
+#
+#	OSX-specific
+#
+
+PLATFORM_CFLAGS = -DSUPERMODEL_OSX -DUSE_FILE32API -F/Library/Frameworks/
+PLATFORM_LDFLAGS = -lz -lm -lstdc++ -F/Library/Frameworks/
+
+
+###############################################################################
+# Core Makefile
+###############################################################################
+
+MUSASHI_OUTFILE = $(OBJ_DIR)/m68kmake
+
+include Makefiles/Makefile.inc
+
+clean:	 
+	rm $(OUTFILE)
+	rm -f $(OBJ_DIR)/*
diff --git a/Makefiles/Makefile.SDL.OSX.GCC b/Makefiles/Makefile.SDL.OSX.GCC
deleted file mode 100644
index 399dc8e..0000000
--- a/Makefiles/Makefile.SDL.OSX.GCC
+++ /dev/null
@@ -1,239 +0,0 @@
-##
-## Supermodel
-## A Sega Model 3 Arcade Emulator.
-## Copyright 2011-2016 Bart Trzynadlowski, Nik Henson 
-##
-## This file is part of Supermodel.
-##
-## Supermodel is free software: you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free 
-## Software Foundation, either version 3 of the License, or (at your option)
-## any later version.
-##
-## Supermodel is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-## FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-## more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with Supermodel.  If not, see <http://www.gnu.org/licenses/>.
-##
-
-#
-# Makefile.SDL.OSX.GCC
-#
-# GNU Makefile for SDL port using GCC on Mac OS X.
-#
-
-###############################################################################
-# Build Options
-###############################################################################
-
-#
-# Include console-based debugger in emulator ('yes' or 'no')
-#
-ENABLE_DEBUGGER = no
-
-
-###############################################################################
-# Required Libraries
-#
-# Edit these paths as necessary.
-###############################################################################
-
-#
-# SDL
-#
-SDL_LDFLAGS = -framework SDL -framework AGL -framework OpenGL -framework GLUT -framework Cocoa
-SDL_INCLUDEPATH = 
-
-
-###############################################################################
-# Outputs
-###############################################################################
-
-OUTFILE = Supermodel
-OBJ_DIR = obj
-BIN_DIR = bin
-OUTFILE = $(BIN_DIR)/Supermodel
-
-
-###############################################################################
-# Compiler
-###############################################################################
-
-CC = gcc
-OCC = gcc
-LD = gcc
-COMPILER_FLAGS = -I$(OBJ_DIR) -ISrc/ -ISrc/OSD -ISrc/OSD/SDL/ -ISrc/Pkgs/ -ISrc/CPU/68K/Musashi -ISrc/Sound/MPEG  -c -Wall -O3 -DUSE_FILE32API -DSUPERMODEL_OSX -F/Library/Frameworks/
-CFLAGS = $(COMPILER_FLAGS)
-CPPFLAGS = $(COMPILER_FLAGS) -std=c++11
-LFLAGS = -o $(OUTFILE) $(SDL_LDFLAGS) -lz -lm -lstdc++ -F/Library/Frameworks/
-
-#
-# Build options...
-#
-
-# Add compiler flags for various options
-ifeq ($(strip $(ENABLE_DEBUGGER)),yes)
-	COMPILER_FLAGS += -DSUPERMODEL_DEBUGGER
-endif
-
-
-###############################################################################
-# Build Instructions
-###############################################################################
-
-#
-# Objects and Dependencies
-#
-HEADERS = Src/Supermodel.h Src/Games.h Src/OSD/SDL/Types.h
-OBJ = $(OBJ_DIR)/PPCDisasm.o $(OBJ_DIR)/BlockFile.o $(OBJ_DIR)/93C46.o \
-	$(OBJ_DIR)/unzip.o $(OBJ_DIR)/ioapi.o $(OBJ_DIR)/Error.o $(OBJ_DIR)/glew.o $(OBJ_DIR)/Shader.o \
-	$(OBJ_DIR)/JTAG.o $(OBJ_DIR)/Real3D.o $(OBJ_DIR)/Legacy3D.o $(OBJ_DIR)/Models.o $(OBJ_DIR)/TextureRefs.o \
-	$(OBJ_DIR)/New3D.o $(OBJ_DIR)/Mat4.o $(OBJ_DIR)/Model.o $(OBJ_DIR)/PolyHeader.o $(OBJ_DIR)/Texture.o $(OBJ_DIR)/TextureSheet.o $(OBJ_DIR)/VBO.o $(OBJ_DIR)/Vec.o $(OBJ_DIR)/R3DShader.o $(OBJ_DIR)/R3DFloat.o \
-	$(OBJ_DIR)/Render2D.o $(OBJ_DIR)/TileGen.o \
-	$(OBJ_DIR)/Model3.o $(OBJ_DIR)/ppc.o $(OBJ_DIR)/Main.o $(OBJ_DIR)/Audio.o $(OBJ_DIR)/Thread.o $(OBJ_DIR)/SoundBoard.o \
-	$(OBJ_DIR)/SCSP.o $(OBJ_DIR)/SCSPDSP.o $(OBJ_DIR)/68K.o $(OBJ_DIR)/m68kcpu.o $(OBJ_DIR)/m68kopnz.o $(OBJ_DIR)/m68kopdm.o \
-	$(OBJ_DIR)/m68kopac.o $(OBJ_DIR)/m68kops.o $(OBJ_DIR)/DSB.o $(OBJ_DIR)/Z80.o \
-	$(OBJ_DIR)/IRQ.o $(OBJ_DIR)/53C810.o $(OBJ_DIR)/PCI.o $(OBJ_DIR)/RTC72421.o $(OBJ_DIR)/DriveBoard.o \
-	$(OBJ_DIR)/MPC10x.o $(OBJ_DIR)/Input.o $(OBJ_DIR)/Inputs.o $(OBJ_DIR)/InputSource.o $(OBJ_DIR)/InputSystem.o \
-	$(OBJ_DIR)/InputTypes.o $(OBJ_DIR)/MultiInputSource.o $(OBJ_DIR)/SDLInputSystem.o \
-	$(OBJ_DIR)/Outputs.o \
-	$(OBJ_DIR)/amp_audio.o $(OBJ_DIR)/amp_dump.o $(OBJ_DIR)/amp_getbits.o $(OBJ_DIR)/amp_getdata.o $(OBJ_DIR)/amp_huffman.o \
-	$(OBJ_DIR)/amp_layer2.o $(OBJ_DIR)/amp_layer3.o $(OBJ_DIR)/amp_misc2.o $(OBJ_DIR)/amp_position.o $(OBJ_DIR)/amp_transform.o \
-	$(OBJ_DIR)/amp_util.o \
-	$(OBJ_DIR)/Crypto.o \
-	$(OBJ_DIR)/Format.o \
-	$(OBJ_DIR)/Logger.o \
-	$(OBJ_DIR)/NewConfig.o \
-	$(OBJ_DIR)/ByteSwap.o \
-	$(OBJ_DIR)/ConfigBuilders.o \
-	$(OBJ_DIR)/GameLoader.o \
-	$(OBJ_DIR)/tinyxml2.o \
-	$(OBJ_DIR)/ROMSet.o \
-	$(OBJ_DIR)/BitRegister.o \
-	$(OBJ_DIR)/SDLMain_tmpl.o
-
-# If built-in debugger enabled, include all debugging classes
-ifeq ($(strip $(ENABLE_DEBUGGER)),yes)
-	OBJ += $(OBJ_DIR)/Debugger.o $(OBJ_DIR)/ConsoleDebugger.o $(OBJ_DIR)/SupermodelDebugger.o $(OBJ_DIR)/CPUDebug.o \
-		$(OBJ_DIR)/AddressTable.o $(OBJ_DIR)/Breakpoint.o $(OBJ_DIR)/CodeAnalyser.o $(OBJ_DIR)/Exception.o \
-		$(OBJ_DIR)/Interrupt.o $(OBJ_DIR)/IO.o $(OBJ_DIR)/Label.o $(OBJ_DIR)/Register.o $(OBJ_DIR)/Watch.o \
-		$(OBJ_DIR)/PPCDebug.o $(OBJ_DIR)/68KDebug.o $(OBJ_DIR)/Musashi68KDebug.o $(OBJ_DIR)/Z80Debug.o		
-endif
-
-#
-# Targets
-#
-all:	$(BIN_DIR) $(OBJ_DIR) $(OBJ)
-	$(LD) $(LFLAGS) $(OBJ_LIBS) $(OBJ)
-
-$(BIN_DIR):
-	mkdir $(BIN_DIR) 
-	
-$(OBJ_DIR):
-	mkdir $(OBJ_DIR)
-
-clean:	
-	rm -f $(OUTFILE)
-	rm -f $(OBJ_DIR)/*.*
-
-#
-# Musashi 68K emulator
-#
-# All generated source files are emitted to the object directory. For MSVC, 
-# INLINE must be redefined as "static __inline", which is the syntax in C mode.
-#
-$(OBJ_DIR)/m68kmake: Src/CPU/68K/Musashi/m68kmake.c
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kmake.o
-	$(LD) $(OBJ_DIR)/m68kmake.o -o $(OBJ_DIR)/m68kmake
-	
-$(OBJ_DIR)/m68kops.h: $(OBJ_DIR)/m68kmake Src/CPU/68K/Musashi/m68k_in.c
-	$(OBJ_DIR)/m68kmake $(OBJ_DIR) Src/CPU/68K/Musashi/m68k_in.c
-
-$(OBJ_DIR)/m68kcpu.o: Src/CPU/68K/Musashi/m68kcpu.c $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h Src/CPU/68K/Musashi/m68kctx.h
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kcpu.o -I$(OBJ_DIR) -ISrc/CPU/68K/Musashi -DINLINE="static inline"
-
-$(OBJ_DIR)/m68kops.o: $(OBJ_DIR)/m68kops.c $(OBJ_DIR)/m68kmake $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h Src/CPU/68K/Musashi/m68kctx.h
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kops.o -ISrc/CPU/68K/Musashi -DINLINE="static inline"
-
-$(OBJ_DIR)/m68kopac.o: $(OBJ_DIR)/m68kopac.c $(OBJ_DIR)/m68kmake $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h Src/CPU/68K/Musashi/m68kctx.h
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kopac.o -ISrc/CPU/68K/Musashi -DINLINE="static inline"
-
-$(OBJ_DIR)/m68kopdm.o: $(OBJ_DIR)/m68kopdm.c $(OBJ_DIR)/m68kmake $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h Src/CPU/68K/Musashi/m68kctx.h
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kopdm.o -ISrc/CPU/68K/Musashi -DINLINE="static inline"
-
-$(OBJ_DIR)/m68kopnz.o: $(OBJ_DIR)/m68kopnz.c $(OBJ_DIR)/m68kmake $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h Src/CPU/68K/Musashi/m68kctx.h
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kopnz.o -ISrc/CPU/68K/Musashi -DINLINE="static inline"
-
-#
-# Rules for Supermodel C++ code
-#
-$(OBJ_DIR)/%.o:	Src/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Model3/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Graphics/%.cpp Src/Graphics/Shaders2D.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-	
-$(OBJ_DIR)/%.o:	Src/Graphics/Legacy3D/%.cpp Src/Graphics/Legacy3D/%.h Src/Graphics/Legacy3D/Shaders3D.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Graphics/Legacy3D/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Graphics/New3D/%.cpp Src/Graphics/New3D/%.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Sound/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Debugger/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Debugger/CPU/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-	
-$(OBJ_DIR)/%.o:	Src/CPU/PowerPC/%.cpp Src/CPU/PowerPC/ppc.h Src/CPU/PowerPC/ppc603.c Src/CPU/PowerPC/ppc_ops.c Src/CPU/PowerPC/ppc_ops.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/CPU/68K/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/CPU/Z80/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Inputs/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-			
-$(OBJ_DIR)/%.o:	Src/OSD/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-	
-$(OBJ_DIR)/%.o:	Src/OSD/SDL/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/OSD/Windows/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Pkgs/%.c
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/$(*F).o
-	
-$(OBJ_DIR)/%.o:	Src/Util/%.cpp Src/Util/%.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o: Src/OSD/SDL/%.m $(HEADERS)
-	$(OCC) -x objective-c++ $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-#
-# AMP MPEG decoder library
-#
-# To eliminate name conflicts, object files have the prefix "amp_" attached.
-#
-$(OBJ_DIR)/amp_%.o:	Src/Sound/MPEG/%.cpp Src/Sound/MPEG/%.h
-	$(CC) $< $(CPPFLAGS) -o $(OBJ_DIR)/amp_$(*F).o
-	
-$(OBJ_DIR)/amp_%.o:	Src/Sound/MPEG/%.cpp
-	$(CC) $< $(CPPFLAGS) -o $(OBJ_DIR)/amp_$(*F).o
diff --git a/Makefiles/Makefile.SDL.UNIX.GCC b/Makefiles/Makefile.SDL.UNIX.GCC
deleted file mode 100644
index a7df945..0000000
--- a/Makefiles/Makefile.SDL.UNIX.GCC
+++ /dev/null
@@ -1,245 +0,0 @@
-##
-## Supermodel
-## A Sega Model 3 Arcade Emulator.
-## Copyright 2011 Bart Trzynadlowski, Nik Henson
-##
-## This file is part of Supermodel.
-##
-## Supermodel is free software: you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free 
-## Software Foundation, either version 3 of the License, or (at your option)
-## any later version.
-##
-## Supermodel is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-## FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-## more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with Supermodel.  If not, see <http://www.gnu.org/licenses/>.
-##
-
-#
-# Makefile.SDL.UNIX.GCC
-#
-# GNU Makefile for SDL port using GCC on modern Linux (e.g. Fedora 14). 
-# Copy this Makefile to the base directory of the source distribution (one up 
-# from Src/ and here).
-#
-
-
-###############################################################################
-# Build Options
-###############################################################################
-
-#
-# Include console-based debugger in emulator ('yes' or 'no')
-#
-ENABLE_DEBUGGER = no
-
-
-###############################################################################
-# Required Libraries
-#
-# Edit these paths as necessary.
-###############################################################################
-
-#
-# Boost 1.55+
-#
-BOOST_INCLUDEPATH = /usr/local/include
-
-#
-# SDL
-#
-SDL_CFLAGS = `sdl-config --cflags`
-SDL_LIBFLAGS = `sdl-config --libs`
-
-
-###############################################################################
-# Outputs
-###############################################################################
-
-OUTFILE = Supermodel
-OBJ_DIR = obj
-BIN_DIR = bin
-OUTFILE = $(BIN_DIR)/Supermodel
-
-
-###############################################################################
-# Compiler and Linker
-###############################################################################
-
-CC = gcc
-LD = gcc
-COMPILER_FLAGS = $(SDL_CFLAGS) -ISrc/ -ISrc/OSD/SDL/ -ISrc/Pkgs/ -c -Wall -O3
-CFLAGS += $(COMPILER_FLAGS)
-CPPFLAGS += $(CXXFLAGS) $(COMPILER_FLAGS) -std=c++11
-LFLAGS += -o $(OUTFILE) $(SDL_LIBFLAGS) -lGL -lGLU -lz -lm -lstdc++
-
-#
-# Build options...
-#
-
-# Add compiler flags for various options
-ifeq ($(strip $(ENABLE_DEBUGGER)),yes)
-	COMPILER_FLAGS += -DSUPERMODEL_DEBUGGER
-endif
-
-
-###############################################################################
-# Build Instructions
-###############################################################################
-
-#
-# Objects and Dependencies
-#
-HEADERS = Src/Supermodel.h Src/OSD/SDL/Types.h
-OBJ = $(OBJ_DIR)/PPCDisasm.o $(OBJ_DIR)/BlockFile.o $(OBJ_DIR)/93C46.o \
-	$(OBJ_DIR)/unzip.o $(OBJ_DIR)/ioapi.o $(OBJ_DIR)/Error.o $(OBJ_DIR)/glew.o $(OBJ_DIR)/Shader.o \
-	$(OBJ_DIR)/JTAG.o $(OBJ_DIR)/Real3D.o $(OBJ_DIR)/Legacy3D.o $(OBJ_DIR)/Models.o $(OBJ_DIR)/TextureRefs.o \
-	$(OBJ_DIR)/New3D.o $(OBJ_DIR)/Mat4.o $(OBJ_DIR)/Model.o $(OBJ_DIR)/PolyHeader.o $(OBJ_DIR)/Texture.o $(OBJ_DIR)/TextureSheet.o $(OBJ_DIR)/VBO.o $(OBJ_DIR)/Vec.o $(OBJ_DIR)/R3DShader.o $(OBJ_DIR)/R3DFloat.o $(OBJ_DIR)/R3DScrollFog.o \
-	$(OBJ_DIR)/Render2D.o $(OBJ_DIR)/TileGen.o \
-	$(OBJ_DIR)/Model3.o $(OBJ_DIR)/ppc.o $(OBJ_DIR)/Main.o $(OBJ_DIR)/Audio.o $(OBJ_DIR)/Thread.o $(OBJ_DIR)/SoundBoard.o \
-	$(OBJ_DIR)/SCSP.o $(OBJ_DIR)/SCSPDSP.o $(OBJ_DIR)/68K.o $(OBJ_DIR)/m68kcpu.o $(OBJ_DIR)/m68kopnz.o $(OBJ_DIR)/m68kopdm.o \
-	$(OBJ_DIR)/m68kopac.o $(OBJ_DIR)/m68kops.o $(OBJ_DIR)/DSB.o $(OBJ_DIR)/Z80.o \
-	$(OBJ_DIR)/IRQ.o $(OBJ_DIR)/53C810.o $(OBJ_DIR)/PCI.o $(OBJ_DIR)/RTC72421.o $(OBJ_DIR)/DriveBoard.o \
-	$(OBJ_DIR)/MPC10x.o $(OBJ_DIR)/Input.o $(OBJ_DIR)/Inputs.o $(OBJ_DIR)/InputSource.o $(OBJ_DIR)/InputSystem.o \
-	$(OBJ_DIR)/InputTypes.o $(OBJ_DIR)/MultiInputSource.o $(OBJ_DIR)/SDLInputSystem.o \
-	$(OBJ_DIR)/Outputs.o \
-	$(OBJ_DIR)/amp_audio.o $(OBJ_DIR)/amp_dump.o $(OBJ_DIR)/amp_getbits.o $(OBJ_DIR)/amp_getdata.o $(OBJ_DIR)/amp_huffman.o \
-	$(OBJ_DIR)/amp_layer2.o $(OBJ_DIR)/amp_layer3.o $(OBJ_DIR)/amp_misc2.o $(OBJ_DIR)/amp_position.o $(OBJ_DIR)/amp_transform.o \
-	$(OBJ_DIR)/amp_util.o \
-	$(OBJ_DIR)/Crypto.o \
-	$(OBJ_DIR)/Logger.o \
-	$(OBJ_DIR)/Format.o \
-	$(OBJ_DIR)/NewConfig.o \
-	$(OBJ_DIR)/ByteSwap.o \
-	$(OBJ_DIR)/ConfigBuilders.o \
-	$(OBJ_DIR)/GameLoader.o \
-	$(OBJ_DIR)/tinyxml2.o \
-	$(OBJ_DIR)/ROMSet.o \
-	$(OBJ_DIR)/BitRegister.o
-
-# If built-in debugger enabled, include all debugging classes
-ifeq ($(strip $(ENABLE_DEBUGGER)),yes)
-	OBJ += $(OBJ_DIR)/Debugger.o $(OBJ_DIR)/ConsoleDebugger.o $(OBJ_DIR)/SupermodelDebugger.o $(OBJ_DIR)/CPUDebug.o \
-		$(OBJ_DIR)/AddressTable.o $(OBJ_DIR)/Breakpoint.o $(OBJ_DIR)/CodeAnalyser.o $(OBJ_DIR)/Exception.o \
-		$(OBJ_DIR)/Interrupt.o $(OBJ_DIR)/IO.o $(OBJ_DIR)/Label.o $(OBJ_DIR)/Register.o $(OBJ_DIR)/Watch.o \
-		$(OBJ_DIR)/PPCDebug.o $(OBJ_DIR)/68KDebug.o $(OBJ_DIR)/Musashi68KDebug.o $(OBJ_DIR)/Z80Debug.o		
-endif
-
-#
-# Targets
-#
-all:	$(BIN_DIR) $(OBJ_DIR) $(OBJ)
-	$(LD) $(OBJ_LIBS) $(OBJ) $(LFLAGS)
-
-$(BIN_DIR):
-	mkdir $(BIN_DIR) 
-
-$(OBJ_DIR):
-	mkdir $(OBJ_DIR)
-
-clean:	
-	rm -f $(OUTFILE)
-	rm -f $(OBJ_DIR)/*.*
-
-#
-# Musashi 68K emulator
-#
-# All generated source files are emitted to the object directory. For MSVC, 
-# INLINE must be redefined as "static __inline", which is the syntax in C mode.
-#
-$(OBJ_DIR)/m68kmake: Src/CPU/68K/Musashi/m68kmake.c
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kmake.o
-	$(LD) $(OBJ_DIR)/m68kmake.o -o $(OBJ_DIR)/m68kmake
-	
-$(OBJ_DIR)/m68kops.h: $(OBJ_DIR)/m68kmake Src/CPU/68K/Musashi/m68k_in.c
-	$(OBJ_DIR)/m68kmake $(OBJ_DIR) Src/CPU/68K/Musashi/m68k_in.c
-
-$(OBJ_DIR)/m68kcpu.o: Src/CPU/68K/Musashi/m68kcpu.c $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h Src/CPU/68K/Musashi/m68kctx.h
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kcpu.o -I$(OBJ_DIR) -ISrc/CPU/68K/Musashi -DINLINE="static inline"
-
-$(OBJ_DIR)/m68kops.o: $(OBJ_DIR)/m68kops.c $(OBJ_DIR)/m68kmake $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h Src/CPU/68K/Musashi/m68kctx.h
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kops.o -ISrc/CPU/68K/Musashi -DINLINE="static inline"
-
-$(OBJ_DIR)/m68kopac.o: $(OBJ_DIR)/m68kopac.c $(OBJ_DIR)/m68kmake $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h Src/CPU/68K/Musashi/m68kctx.h
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kopac.o -ISrc/CPU/68K/Musashi -DINLINE="static inline"
-
-$(OBJ_DIR)/m68kopdm.o: $(OBJ_DIR)/m68kopdm.c $(OBJ_DIR)/m68kmake $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h Src/CPU/68K/Musashi/m68kctx.h
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kopdm.o -ISrc/CPU/68K/Musashi -DINLINE="static inline"
-
-$(OBJ_DIR)/m68kopnz.o: $(OBJ_DIR)/m68kopnz.c $(OBJ_DIR)/m68kmake $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h Src/CPU/68K/Musashi/m68kctx.h
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kopnz.o -ISrc/CPU/68K/Musashi -DINLINE="static inline"
-
-#
-# Rules for Supermodel C++ code
-#
-$(OBJ_DIR)/%.o:	Src/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Model3/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Graphics/%.cpp Src/Graphics/Shaders2D.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-	
-$(OBJ_DIR)/%.o:	Src/Graphics/Legacy3D/%.cpp Src/Graphics/Legacy3D/%.h Src/Graphics/Legacy3D/Shaders3D.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Graphics/Legacy3D/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Graphics/New3D/%.cpp Src/Graphics/New3D/%.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Sound/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Debugger/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Debugger/CPU/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-	
-$(OBJ_DIR)/%.o:	Src/CPU/PowerPC/%.cpp Src/CPU/PowerPC/ppc.h Src/CPU/PowerPC/ppc603.c Src/CPU/PowerPC/ppc_ops.c Src/CPU/PowerPC/ppc_ops.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/CPU/68K/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/CPU/Z80/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Inputs/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-			
-$(OBJ_DIR)/%.o:	Src/OSD/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-	
-$(OBJ_DIR)/%.o:	Src/OSD/SDL/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/OSD/Windows/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Pkgs/%.c
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Pkgs/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Util/%.cpp Src/Util/%.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-#
-# AMP MPEG decoder library
-#
-# To eliminate name conflicts, object files have the prefix "amp_" attached.
-#
-$(OBJ_DIR)/amp_%.o:	Src/Sound/MPEG/%.cpp Src/Sound/MPEG/%.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/amp_$(*F).o
-	
-$(OBJ_DIR)/amp_%.o:	Src/Sound/MPEG/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/amp_$(*F).o
diff --git a/Makefiles/Makefile.SDL.Win32.GCC b/Makefiles/Makefile.SDL.Win32.GCC
deleted file mode 100644
index a630a7a..0000000
--- a/Makefiles/Makefile.SDL.Win32.GCC
+++ /dev/null
@@ -1,276 +0,0 @@
-##
-## Supermodel
-## A Sega Model 3 Arcade Emulator.
-## Copyright 2011 Bart Trzynadlowski, Nik Henson
-##
-## This file is part of Supermodel.
-##
-## Supermodel is free software: you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free 
-## Software Foundation, either version 3 of the License, or (at your option)
-## any later version.
-##
-## Supermodel is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-## FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-## more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with Supermodel.  If not, see <http://www.gnu.org/licenses/>.
-##
-
-#
-# Makefile.SDL.Win32.GCC
-#
-# GNU Makefile for SDL port using GCC (MinGW) on Windows.
-#
-
-
-###############################################################################
-# Build Options
-###############################################################################
-
-#
-# Bitness of build ('32' or '64')
-#
-BITS = 64
-
-#
-# Include console-based debugger in emulator ('yes' or 'no')
-#
-ENABLE_DEBUGGER = yes
-
-
-###############################################################################
-# Required Libraries
-#
-# Edit these paths as necessary.
-###############################################################################
-
-#
-# Boost 1.55
-#
-BOOST_INCLUDEPATH = /mingw64/boost_1_55_0
-
-#
-# SDL
-#
-ifeq ($(strip $(BITS)),64)
-	SDL_LIBPATH = /mingw64/lib64 
-	#SDL_INCLUDEPATH = /mingw64/x86_64-w64-mingw32/include/SDL
-	SDL_INCLUDEPATH = c:\tdm-gcc-64\include\SDL
-else
-	SDL_LIBPATH = /mingw/lib 
-	SDL_INCLUDEPATH = /mingw/include/SDL
-endif	
-
-#
-# Microsoft Windows SDK
-#
-ifeq ($(strip $(BITS)),64)
-	WINSDK_LIBPATH = /Program\ Files/Microsoft\ SDKs/Windows/v7.0/Lib/x64
-	#WINSDK_LIBPATH = /Program\ Files\ (x86)/Windows\ Kits/10/Lib/10.0.10586.0/um/x64
-else
-	WINSDK_LIBPATH = /Program\ Files/Microsoft\ SDKs/Windows/v7.0/Lib
-endif
-
-
-###############################################################################
-# Outputs
-###############################################################################
-
-ifeq ($(strip $(BITS)),64)
-	OBJ_DIR = obj64
-	BIN_DIR = bin64
-else
-	OBJ_DIR = obj
-	BIN_DIR = bin
-endif
-
-OUTFILE = $(BIN_DIR)\Supermodel.exe
-
-
-###############################################################################
-# Compiler and Linker
-###############################################################################
-
-CC = gcc
-CXX = g++
-LD = g++
-COMPILER_FLAGS = -I$(SDL_INCLUDEPATH) -ISrc/ -ISrc/OSD/ -ISrc/OSD/SDL/ -ISrc/OSD/Windows/ -c -Wall -DSUPERMODEL_WIN32 -DGLEW_STATIC -O3
-CFLAGS = $(COMPILER_FLAGS)
-CPPFLAGS = $(COMPILER_FLAGS) -I$(BOOST_INCLUDEPATH) -std=c++11
-LFLAGS = -o $(OUTFILE) $(OBJ) -L$(SDL_LIBPATH) -lmingw32 -lSDLmain -lSDL -lopengl32 -lglu32 -ldinput8 -ldxguid -lole32 -loleaut32 -lwbemuuid -lz -s # -l:$(WINSDK_LIBPATH)/WbemUuid.lib -s
-
-#
-# Build options...
-#
-
-# Add compiler flags for various options
-ifeq ($(strip $(ENABLE_DEBUGGER)),yes)
-	COMPILER_FLAGS += -DSUPERMODEL_DEBUGGER
-endif
-
-
-###############################################################################
-# Build Instructions
-###############################################################################
-
-#
-# Objects and Dependencies
-#
-OBJ = $(OBJ_DIR)/PPCDisasm.o $(OBJ_DIR)/BlockFile.o $(OBJ_DIR)/93C46.o \
-	$(OBJ_DIR)/unzip.o $(OBJ_DIR)/ioapi.o $(OBJ_DIR)/Error.o $(OBJ_DIR)/glew.o $(OBJ_DIR)/Shader.o \
-	$(OBJ_DIR)/JTAG.o $(OBJ_DIR)/Real3D.o $(OBJ_DIR)/Legacy3D.o $(OBJ_DIR)/Models.o $(OBJ_DIR)/TextureRefs.o \
-	$(OBJ_DIR)/New3D.o $(OBJ_DIR)/Mat4.o $(OBJ_DIR)/Model.o $(OBJ_DIR)/PolyHeader.o $(OBJ_DIR)/Texture.o $(OBJ_DIR)/TextureSheet.o $(OBJ_DIR)/VBO.o $(OBJ_DIR)/Vec.o $(OBJ_DIR)/R3DShader.o $(OBJ_DIR)/R3DFloat.o \
-	$(OBJ_DIR)/R3DScrollFog.o \
-	$(OBJ_DIR)/Render2D.o $(OBJ_DIR)/TileGen.o \
-	$(OBJ_DIR)/Model3.o $(OBJ_DIR)/ppc.o $(OBJ_DIR)/Main.o $(OBJ_DIR)/Audio.o $(OBJ_DIR)/Thread.o $(OBJ_DIR)/SoundBoard.o \
-	$(OBJ_DIR)/SCSP.o $(OBJ_DIR)/SCSPDSP.o $(OBJ_DIR)/68K.o $(OBJ_DIR)/m68kcpu.o $(OBJ_DIR)/m68kopnz.o $(OBJ_DIR)/m68kopdm.o \
-	$(OBJ_DIR)/m68kopac.o $(OBJ_DIR)/m68kops.o $(OBJ_DIR)/DSB.o $(OBJ_DIR)/Z80.o \
-	$(OBJ_DIR)/IRQ.o $(OBJ_DIR)/53C810.o $(OBJ_DIR)/PCI.o $(OBJ_DIR)/RTC72421.o $(OBJ_DIR)/DriveBoard.o \
-	$(OBJ_DIR)/MPC10x.o $(OBJ_DIR)/Input.o $(OBJ_DIR)/Inputs.o $(OBJ_DIR)/InputSource.o $(OBJ_DIR)/InputSystem.o \
-	$(OBJ_DIR)/InputTypes.o $(OBJ_DIR)/MultiInputSource.o $(OBJ_DIR)/SDLInputSystem.o $(OBJ_DIR)/DirectInputSystem.o \
-	$(OBJ_DIR)/Outputs.o $(OBJ_DIR)/WinOutputs.o \
-	$(OBJ_DIR)/amp_audio.o $(OBJ_DIR)/amp_dump.o $(OBJ_DIR)/amp_getbits.o $(OBJ_DIR)/amp_getdata.o $(OBJ_DIR)/amp_huffman.o \
-	$(OBJ_DIR)/amp_layer2.o $(OBJ_DIR)/amp_layer3.o $(OBJ_DIR)/amp_misc2.o $(OBJ_DIR)/amp_position.o $(OBJ_DIR)/amp_transform.o \
-	$(OBJ_DIR)/amp_util.o \
-	$(OBJ_DIR)/Crypto.o \
-	$(OBJ_DIR)/Logger.o \
-	$(OBJ_DIR)/tinyxml2.o \
-	$(OBJ_DIR)/ByteSwap.o $(OBJ_DIR)/Format.o $(OBJ_DIR)/NewConfig.o $(OBJ_DIR)/ConfigBuilders.o $(OBJ_DIR)/GameLoader.o $(OBJ_DIR)/ROMSet.o $(OBJ_DIR)/BitRegister.o
-
-
-# If built-in debugger enabled, include all debugging classes
-ifeq ($(strip $(ENABLE_DEBUGGER)),yes)
-	OBJ += $(OBJ_DIR)/Debugger.o $(OBJ_DIR)/ConsoleDebugger.o $(OBJ_DIR)/SupermodelDebugger.o $(OBJ_DIR)/CPUDebug.o \
-		$(OBJ_DIR)/AddressTable.o $(OBJ_DIR)/Breakpoint.o $(OBJ_DIR)/CodeAnalyser.o $(OBJ_DIR)/Exception.o \
-		$(OBJ_DIR)/Interrupt.o $(OBJ_DIR)/IO.o $(OBJ_DIR)/Label.o $(OBJ_DIR)/Register.o $(OBJ_DIR)/Watch.o \
-		$(OBJ_DIR)/PPCDebug.o $(OBJ_DIR)/68KDebug.o $(OBJ_DIR)/Musashi68KDebug.o $(OBJ_DIR)/Z80Debug.o
-endif
-
-
-#
-# Targets
-#
-all:	$(BIN_DIR) $(OBJ_DIR) $(OBJ)
-	$(LD) $(LFLAGS)
-
-ppcd: $(BIN_DIR) $(OBJ_DIR)
-	$(CXX) Src/CPU/PowerPC/PPCDisasm.cpp $(CPPFLAGS) -DSTANDALONE -o $(OBJ_DIR)/ppcd.o
-	$(LD) -o $(BIN_DIR)/ppcd.exe -mconsole $(OBJ_DIR)/ppcd.o
-
-tests: $(BIN_DIR) $(OBJ_DIR) $(OBJ_DIR)/NewConfig.o $(OBJ_DIR)/ConfigBuilders.o Src/Util/Test_Config.cpp Src/Pkgs/tinyxml2.cpp
-	$(CXX) Src/Util/Test_Config.cpp $(CPPFLAGS) -o $(OBJ_DIR)/Test_Config.o
-	$(LD) -o $(BIN_DIR)/test_config.exe -mconsole $(OBJ_DIR)/Test_Config.o $(OBJ_DIR)/Format.o $(OBJ_DIR)/NewConfig.o $(OBJ_DIR)/ConfigBuilders.o $(OBJ_DIR)/Logger.o $(OBJ_DIR)/tinyxml2.o
-
-$(BIN_DIR):
-	mkdir $(BIN_DIR)
-	
-$(OBJ_DIR):
-	mkdir $(OBJ_DIR)
-
-clean:	
-	del $(OUTFILE)
-	del $(OBJ_DIR)\*.o
-	del $(OBJ_DIR)\*.c
-	del $(OBJ_DIR)\*.h
-	del $(OBJ_DIR)\*.exe
-
-
-#
-# Musashi 68K emulator
-#
-# All generated source files are emitted to the object directory. For MSVC, 
-# INLINE must be redefined as "static __inline", which is the syntax in C mode.
-#
-$(OBJ_DIR)/m68kmake.exe: Src/CPU/68K/Musashi/m68kmake.c
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kmake.o
-	$(LD) -o $(OBJ_DIR)/m68kmake.exe -mconsole $(OBJ_DIR)/m68kmake.o
-	
-$(OBJ_DIR)/m68kops.h: $(OBJ_DIR)/m68kmake.exe Src/CPU/68K/Musashi/m68k_in.c
-	$(OBJ_DIR)/m68kmake.exe $(OBJ_DIR) Src/CPU/68K/Musashi/m68k_in.c
-
-$(OBJ_DIR)/m68kcpu.o: Src/CPU/68K/Musashi/m68kcpu.c $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kcpu.o -I "$(OBJ_DIR)" -I "Src\CPU\68K\Musashi"
-
-$(OBJ_DIR)/m68kops.o: $(OBJ_DIR)/m68kops.c $(OBJ_DIR)/m68kmake.exe $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kops.o -I "Src\CPU\68K\Musashi"
-
-$(OBJ_DIR)/m68kopac.o: $(OBJ_DIR)/m68kopac.c $(OBJ_DIR)/m68kmake.exe $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kopac.o -I "Src\CPU\68K\Musashi"
-
-$(OBJ_DIR)/m68kopdm.o: $(OBJ_DIR)/m68kopdm.c $(OBJ_DIR)/m68kmake.exe $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kopdm.o -I "Src\CPU\68K\Musashi"
-
-$(OBJ_DIR)/m68kopnz.o: $(OBJ_DIR)/m68kopnz.c $(OBJ_DIR)/m68kmake.exe $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kopnz.o -I "Src\CPU\68K\Musashi"
-
-
-#
-# Rules for Supermodel C++ code
-#
-$(OBJ_DIR)/%.o:	Src/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Model3/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Graphics/%.cpp Src/Graphics/Shaders2D.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-	
-$(OBJ_DIR)/%.o:	Src/Graphics/Legacy3D/%.cpp Src/Graphics/Legacy3D/%.h Src/Graphics/Legacy3D/Shaders3D.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Graphics/Legacy3D/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Graphics/New3D/%.cpp Src/Graphics/New3D/%.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Sound/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Debugger/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Debugger/CPU/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-	
-$(OBJ_DIR)/%.o:	Src/CPU/PowerPC/%.cpp Src/CPU/PowerPC/ppc.h Src/CPU/PowerPC/ppc603.c Src/CPU/PowerPC/ppc_ops.c Src/CPU/PowerPC/ppc_ops.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/CPU/68K/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/CPU/Z80/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Inputs/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-			
-$(OBJ_DIR)/%.o:	Src/OSD/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-	
-$(OBJ_DIR)/%.o:	Src/OSD/SDL/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/OSD/Windows/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Pkgs/%.c
-	$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/$(*F).o
-	
-$(OBJ_DIR)/%.o:	Src/Pkgs/%.cpp Src/Pkgs/%.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-$(OBJ_DIR)/%.o:	Src/Util/%.cpp Src/Util/%.h
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/$(*F).o
-
-#
-# AMP MPEG decoder library
-#
-# To eliminate name conflicts, object files have the prefix "amp_" attached.
-#
-$(OBJ_DIR)/amp_%.o:	Src/Sound/MPEG/%.cpp
-	$(CXX) $< $(CPPFLAGS) -o $(OBJ_DIR)/amp_$(*F).o
diff --git a/Makefiles/Makefile.UNIX b/Makefiles/Makefile.UNIX
new file mode 100644
index 0000000..74e3370
--- /dev/null
+++ b/Makefiles/Makefile.UNIX
@@ -0,0 +1,77 @@
+##
+## Supermodel
+## A Sega Model 3 Arcade Emulator.
+## Copyright 2011-2017 Bart Trzynadlowski, Nik Henson, Ian Curtis
+##
+## This file is part of Supermodel.
+##
+## Supermodel is free software: you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free 
+## Software Foundation, either version 3 of the License, or (at your option)
+## any later version.
+##
+## Supermodel is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+## more details.
+##
+## You should have received a copy of the GNU General Public License along
+## with Supermodel.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+#
+# Makefile.UNIX
+#
+# Makefile for UNIX/Linux systems.
+#
+
+
+###############################################################################
+# Build Options
+###############################################################################
+
+#
+# Include console-based debugger in emulator ('yes' or 'no')
+#
+ENABLE_DEBUGGER = no
+
+
+###############################################################################
+# Platform Configuration
+#
+# Edit library and include paths as needed.
+###############################################################################
+
+#
+# Toolchain
+#
+CC = gcc
+CXX = g++
+LD = gcc
+
+#
+# SDL
+#
+
+SDL_CFLAGS = `sdl-config --cflags`
+SDL_LDFLAGS = `sdl-config --libs`
+
+#
+#	UNIX-specific
+#
+
+PLATFORM_CFLAGS =
+PLATFORM_LDFLAGS = -lGL -lGLU -lz -lm -lstdc++
+
+
+###############################################################################
+# Core Makefile
+###############################################################################
+
+MUSASHI_OUTFILE = $(OBJ_DIR)/m68kmake
+
+include Makefiles/Makefile.inc
+
+clean:	 
+	rm $(OUTFILE)
+	rm -f $(OBJ_DIR)/*
diff --git a/Makefiles/Makefile.Win32 b/Makefiles/Makefile.Win32
new file mode 100644
index 0000000..8f961ee
--- /dev/null
+++ b/Makefiles/Makefile.Win32
@@ -0,0 +1,112 @@
+##
+## Supermodel
+## A Sega Model 3 Arcade Emulator.
+## Copyright 2011-2017 Bart Trzynadlowski, Nik Henson, Ian Curtis
+##
+## This file is part of Supermodel.
+##
+## Supermodel is free software: you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free 
+## Software Foundation, either version 3 of the License, or (at your option)
+## any later version.
+##
+## Supermodel is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+## more details.
+##
+## You should have received a copy of the GNU General Public License along
+## with Supermodel.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+#
+# Makefile.Win32
+#
+# Makefile for Windows systems using gcc and the standard Command Prompt.
+#
+
+
+###############################################################################
+# Build Options
+###############################################################################
+
+#
+# Bitness of build ('32' or '64')
+#
+BITS = 64
+
+#
+# Include console-based debugger in emulator ('yes' or 'no')
+#
+ENABLE_DEBUGGER = no
+
+
+###############################################################################
+# Platform Configuration
+#
+# Edit library and include paths as needed.
+###############################################################################
+
+#
+# Toolchain
+#
+CC_64 = gcc
+CXX_64 = g++
+LD_64 = g++
+CC_32 = gcc
+CXX_32 = g++
+LD_32 = g++
+
+
+#
+# SDL
+#
+
+SDL_INCLUDE_DIR_64 = c:\tdm-gcc-64\include\SDL
+SDL_LIB_DIR_64 = c:\tdm-gcc-64\lib
+SDL_INCLUDE_DIR_32 =
+SDL_LIB_DIR_32 =
+
+#
+#	MinGW/Windows-specific
+#
+
+PLATFORM_CFLAGS_64 = -DSUPERMODEL_WIN32
+PLATFORM_LDFLAGS_64 = -lmingw32 -lopengl32 -lglu32 -ldinput8 -ldxguid -lole32 -loleaut32 -lwbemuuid -lz
+PLATFORM_CFLAGS_32 = -DSUPERMODEL_WIN32
+PLATFORM_LDFLAGS_32 = -lmingw32 -lopengl32 -lglu32 -ldinput8 -ldxguid -lole32 -loleaut32 -lwbemuuid -lz
+
+
+###############################################################################
+# Core Makefile
+###############################################################################
+
+ifeq ($(strip $(BITS)),64)
+	CC = $(CC_64)
+	CXX = $(CXX_64)
+	LD = $(LD_64)
+	PLATFORM_CFLAGS = $(PLATFORM_CFLAGS_64)
+	PLATFORM_LDFLAGS = $(PLATFORM_LDFLAGS_64)
+	SDL_LDFLAGS = -L$(SDL_LIB_DIR_64) -lSDLmain -lSDL
+	SDL_CFLAGS = -I$(SDL_INCLUDE_DIR_64)
+else
+	CC = $(CC_32)
+	CXX = $(CXX_32)
+	LD = $(LD_32)
+	PLATFORM_CFLAGS = $(PLATFORM_CFLAGS_32)
+	PLATFORM_LDFLAGS = $(PLATFORM_LDFLAGS_32)
+	SDL_LDFLAGS = -L$(SDL_LIB_DIR_32) -lSDLmain -lSDL 
+	SDL_CFLAGS = -I$(SDL_INCLUDE_DIR_32)
+endif
+
+MUSASHI_OUTFILE = $(OBJ_DIR)/m68kmake.exe
+
+include Makefiles/Makefile.inc
+
+clean:	 
+	del $(OUTFILE)
+	del $(OBJ_DIR)\*.d
+	del $(OBJ_DIR)\*.o
+	del $(OBJ_DIR)\*.c
+	del $(OBJ_DIR)\*.h
+	del $(OBJ_DIR)\*.exe
diff --git a/Makefiles/Makefile.inc b/Makefiles/Makefile.inc
new file mode 100644
index 0000000..80aceb6
--- /dev/null
+++ b/Makefiles/Makefile.inc
@@ -0,0 +1,268 @@
+##
+## Supermodel
+## A Sega Model 3 Arcade Emulator.
+## Copyright 2011-2017 Bart Trzynadlowski, Nik Henson, Ian Curtis
+##
+## This file is part of Supermodel.
+##
+## Supermodel is free software: you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free 
+## Software Foundation, either version 3 of the License, or (at your option)
+## any later version.
+##
+## Supermodel is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+## more details.
+##
+## You should have received a copy of the GNU General Public License along
+## with Supermodel.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+#
+# Makefile.inc
+#
+# Core GNU Makefile, included by all (platform-specific) top-level Makefiles.
+#
+
+
+###############################################################################
+# Source Files
+###############################################################################
+
+SRC_FILES = \
+	Src/CPU/PowerPC/PPCDisasm.cpp \
+	Src/BlockFile.cpp \
+	Src/Pkgs/unzip.cpp \
+	Src/Pkgs/ioapi.cpp \
+	Src/Model3/93C46.cpp \
+	Src/Util/BitRegister.cpp \
+	Src/JTAG.cpp \
+	Src/Graphics/Legacy3D/Error.cpp \
+	Src/Pkgs/glew.cpp \
+	Src/Graphics/Shader.cpp \
+	Src/Model3/Real3D.cpp \
+	Src/Graphics/Legacy3D/Legacy3D.cpp \
+	Src/Graphics/Legacy3D/Models.cpp \
+	Src/Graphics/Legacy3D/TextureRefs.cpp \
+	Src/Graphics/New3D/New3D.cpp \
+	Src/Graphics/New3D/Mat4.cpp \
+	Src/Graphics/New3D/Model.cpp \
+	Src/Graphics/New3D/PolyHeader.cpp \
+	Src/Graphics/New3D/Texture.cpp \
+	Src/Graphics/New3D/TextureSheet.cpp \
+	Src/Graphics/New3D/VBO.cpp \
+	Src/Graphics/New3D/Vec.cpp \
+	Src/Graphics/New3D/R3DShader.cpp \
+	Src/Graphics/New3D/R3DFloat.cpp \
+	Src/Graphics/New3D/R3DScrollFog.cpp \
+	Src/Graphics/Render2D.cpp \
+	Src/Model3/TileGen.cpp \
+	Src/Model3/Model3.cpp \
+	Src/CPU/PowerPC/ppc.cpp \
+	Src/OSD/SDL/Main.cpp \
+	Src/OSD/SDL/Audio.cpp \
+	Src/OSD/SDL/Thread.cpp \
+	Src/Model3/SoundBoard.cpp \
+	Src/Sound/SCSP.cpp \
+	Src/Sound/SCSPDSP.cpp \
+	Src/CPU/68K/68K.cpp \
+	$(OBJ_DIR)/m68kcpu.c \
+	$(OBJ_DIR)/m68kopnz.c \
+	$(OBJ_DIR)/m68kopdm.c \
+	$(OBJ_DIR)/m68kopac.c \
+	$(OBJ_DIR)/m68kops.c \
+	Src/Model3/DSB.cpp \
+	Src/CPU/Z80/Z80.cpp \
+	Src/Model3/IRQ.cpp \
+	Src/Model3/53C810.cpp \
+	Src/Model3/PCI.cpp \
+	Src/Model3/RTC72421.cpp \
+	Src/Model3/DriveBoard.cpp \
+	Src/Model3/MPC10x.cpp \
+	Src/Inputs/Input.cpp \
+	Src/Inputs/Inputs.cpp \
+	Src/Inputs/InputSource.cpp \
+	Src/Inputs/InputSystem.cpp \
+	Src/Inputs/InputTypes.cpp \
+	Src/Inputs/MultiInputSource.cpp \
+	Src/OSD/SDL/SDLInputSystem.cpp \
+	Src/OSD/Windows/DirectInputSystem.cpp \
+	Src/OSD/Outputs.cpp \
+	Src/OSD/Windows/WinOutputs.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/Model3/Crypto.cpp \
+	Src/OSD/Logger.cpp \
+	Src/Util/Format.cpp \
+	Src/Util/NewConfig.cpp \
+	Src/Util/ByteSwap.cpp \
+	Src/Util/ConfigBuilders.cpp \
+	Src/GameLoader.cpp \
+	Src/Pkgs/tinyxml2.cpp \
+	Src/ROMSet.cpp
+	
+ifeq ($(strip $(ENABLE_DEBUGGER)),yes)
+	SRC_FILES += \
+		Src/Debugger/Debugger.cpp \
+		Src/Debug/ConsoleDebugger.cpp \
+		Src/Debugger/SupermodelDebugger.cpp \
+		Src/Debugger/CPUDebug.cpp \
+		Src/Debugger/AddressTable.cpp \
+		Src/Debugger/Breakpoint.cpp \
+		Src/Debugger/CodeAnalyser.cpp \
+		Src/Debugger/Exception.cpp \
+		Src/Debugger/Interrupt.cpp \
+		Src/Debugger/IO.cpp \
+		Src/Debugger/Label.cpp \
+		Src/Debugger/Register.cpp \
+		Src/Debugger/Watch.cpp \
+		Src/Debugger/CPU/PPCDebug.cpp \
+		Src/Debugger/CPU/68KDebug.cpp \
+		Src/Debugger/CPU/Musashi68KDebug.cpp \
+		Src/Debugger/CPU/Z80Debug.cpp
+endif
+
+OBJ_FILES = $(foreach file,$(SRC_FILES),$(OBJ_DIR)/$(basename $(notdir $(file))).o)
+
+#
+# Deduce include directories from the source file list. The sort function 
+# removes duplicates and is used to construct a set.
+#
+INCLUDE_DIRS = $(sort $(foreach file,$(SRC_FILES),$(dir	$(file))))
+
+
+###############################################################################
+# Output Locations
+###############################################################################
+
+ifeq ($(strip $(BITS)),64)
+	OBJ_DIR = obj64
+	BIN_DIR = bin64
+else
+	OBJ_DIR = obj32
+	BIN_DIR = bin32
+endif
+
+OUTFILE = $(BIN_DIR)\Supermodel.exe
+
+
+###############################################################################
+# Compiler Flags
+###############################################################################
+
+CPPFLAGS = $(addprefix -I,$(INCLUDE_DIRS)) -DGLEW_STATIC -O3 #-DNEW_FRAME_TIMING
+CFLAGS = $(SDL_CFLAGS) $(PLATFORM_CFLAGS) $(CPPFLAGS) -c -Wall -O3
+CXXFLAGS = $(CFLAGS) -std=c++11
+LDFLAGS = -o $(OUTFILE) $(PLATFORM_LDFLAGS) $(SDL_LDFLAGS) -s
+
+# If built-in debugger enabled, need to define SUPERMODEL_DEBUGGER
+ifeq ($(strip $(ENABLE_DEBUGGER)),yes)
+	PLATFORM_CFLAGS += -DSUPERMODEL_DEBUGGER
+endif
+
+
+###############################################################################
+# Targets
+###############################################################################
+
+# 
+# Default target: build Supermodel binary. Must be specified *before* the auto-
+# generated dependencies because otherwise, make gets confused for some reason
+# and thinks the default target is just one of the object files.
+#
+all: $(BIN_DIR) $(OBJ_DIR) $(OBJ_FILES)
+	$(info Linking Supermodel     : $(OUTFILE))
+	@$(LD) $(OBJ_FILES) $(LDFLAGS)
+
+$(BIN_DIR):
+	$(info Creating directory     : $(BIN_DIR))
+	@mkdir $(BIN_DIR) 
+
+$(OBJ_DIR):
+	$(info Creating directory     : $(OBJ_DIR))
+	@mkdir $(OBJ_DIR)
+
+
+###############################################################################
+# Rules
+###############################################################################
+
+#
+# Create list of auto-generated dependency files (which contain rules that make
+# understands) and include them all.
+#
+AUTODEPS := $(patsubst %.o,%.d,$(OBJ_FILES))
+-include $(AUTODEPS)
+
+#
+# VPATH is the search path for files. This trick allows a single %.cpp rule to
+# be matched against files in sub-directories of Src/.
+#
+VPATH = $(INCLUDE_DIRS)
+
+#
+# Compilation rules that both auto-generate the dependency files and compile
+# the source code. This technique is described in the reply by user "rr-" at:
+# https://stackoverflow.com/questions/8025766/makefile-auto-dependency-generation
+#
+$(OBJ_DIR)/%.o:	%.cpp
+	$(info Generating dependencies: $< -> $(OBJ_DIR)/$(*F).d)
+	@$(CXX) -MM -MP -MT $(OBJ_DIR)/$(*F).o -MT $(OBJ_DIR)/$(*F).d $(CXXFLAGS) $< > $(OBJ_DIR)/$(*F).d
+	$(info Compiling              : $< -> $@)
+	@$(CXX) $(CXXFLAGS) $< -o $@
+
+$(OBJ_DIR)/%.o:	%.c
+	$(info Generating dependencies: $< -> $(OBJ_DIR)/$(*F).d)
+	@$(CC) -MM -MP -MT $(OBJ_DIR)/$(*F).o -MT $(OBJ_DIR)/$(*F).d $(CPPFLAGS) $< > $(OBJ_DIR)/$(*F).d
+	$(info Compiling              : $< -> $@)
+	@$(CC) $(CFLAGS) $< -o $@
+
+#
+# Musashi 68K emulator
+#
+# All generated source files are emitted to the object directory. For MSVC,
+# INLINE must be redefined as "static __inline", which is the syntax in C mode.
+#
+
+MUSASHI_CFLAGS = -ISrc/CPU/68K/Musashi -I$(OBJ_DIR) -DINLINE="static inline" -Wno-unused-variable
+MUSASHI_LDFLAGS = -o $(MUSASHI_OUTFILE) $(OBJ_DIR)/m68kmake.o
+
+$(MUSASHI_OUTFILE): Src/CPU/68K/Musashi/m68kmake.c Src/CPU/68K/Musashi/m68k_in.c
+	$(info Compiling              : $< -> $(OBJ_DIR)/m68kmake.o)
+	@$(CC) $< $(CFLAGS) -o $(OBJ_DIR)/m68kmake.o
+	$(info Linking                : $(MUSASHI_OUTFILE))
+	@$(LD) $(MUSASHI_LDFLAGS)
+	
+$(OBJ_DIR)/m68kops.h $(OBJ_DIR)/m68kops.c $(OBJ_DIR)/m68kopac.c $(OBJ_DIR)/m68kopdm.c $(OBJ_DIR)/m68kopnz.c:	$(MUSASHI_OUTFILE) Src/CPU/68K/Musashi/m68k_in.c Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h
+	$(info Generating 68K emulator: $@)
+	@$(MUSASHI_OUTFILE) $(OBJ_DIR) Src/CPU/68K/Musashi/m68k_in.c
+	
+$(OBJ_DIR)/m68kcpu.o:	Src/CPU/68K/Musashi/m68kcpu.c $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h
+	$(info Compiling              : $< -> $@)
+	@$(CC) $< $(CFLAGS) $(MUSASHI_CFLAGS) -o $(OBJ_DIR)/m68kcpu.o
+
+$(OBJ_DIR)/m68kops.o:	$(OBJ_DIR)/m68kops.c $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h  $(MUSASHI_OUTFILE) 
+	$(info Compiling              : $< -> $@)
+	@$(CC) $< $(CFLAGS) $(MUSASHI_CFLAGS) -o $@
+
+$(OBJ_DIR)/m68kopac.o: $(OBJ_DIR)/m68kopac.c $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h  $(MUSASHI_OUTFILE) 
+	$(info Compiling              : $< -> $@)
+	@$(CC) $< $(CFLAGS) $(MUSASHI_CFLAGS) -o $@
+
+$(OBJ_DIR)/m68kopdm.o: $(OBJ_DIR)/m68kopdm.c $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h  $(MUSASHI_OUTFILE) 
+	$(info Compiling              : $< -> $@)
+	@$(CC) $< $(CFLAGS) $(MUSASHI_CFLAGS) -o $@
+
+$(OBJ_DIR)/m68kopnz.o: $(OBJ_DIR)/m68kopnz.c $(OBJ_DIR)/m68kops.h Src/CPU/68K/Musashi/m68k.h Src/CPU/68K/Musashi/m68kconf.h  $(MUSASHI_OUTFILE) 
+	$(info Compiling              : $< -> $@)
+	@$(CC) $< $(CFLAGS) $(MUSASHI_CFLAGS) -o $@
diff --git a/Src/Sound/MPEG/audio.cpp b/Src/Sound/MPEG/amp_audio.cpp
similarity index 99%
rename from Src/Sound/MPEG/audio.cpp
rename to Src/Sound/MPEG/amp_audio.cpp
index ba1341a..0ebc5ff 100644
--- a/Src/Sound/MPEG/audio.cpp
+++ b/Src/Sound/MPEG/amp_audio.cpp
@@ -44,7 +44,7 @@
 #include "amp.h"
 
 #define AUDIO
-#include "audio.h"
+#include "amp_audio.h"
 #include "formats.h"
 #include "getbits.h"
 #include "huffman.h"
diff --git a/Src/Sound/MPEG/audio.h b/Src/Sound/MPEG/amp_audio.h
similarity index 100%
rename from Src/Sound/MPEG/audio.h
rename to Src/Sound/MPEG/amp_audio.h
diff --git a/Src/Sound/MPEG/dump.cpp b/Src/Sound/MPEG/dump.cpp
index bf2fced..4b9a91d 100644
--- a/Src/Sound/MPEG/dump.cpp
+++ b/Src/Sound/MPEG/dump.cpp
@@ -37,7 +37,7 @@
 //#include <unistd.h>
 #include <string.h>
 
-#include "audio.h"
+#include "amp_audio.h"
 #include "getbits.h"
 
 #define DUMP
diff --git a/Src/Sound/MPEG/getbits.cpp b/Src/Sound/MPEG/getbits.cpp
index d19518d..da9bfb8 100644
--- a/Src/Sound/MPEG/getbits.cpp
+++ b/Src/Sound/MPEG/getbits.cpp
@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "amp.h"
-#include "audio.h"
+#include "amp_audio.h"
 #include "formats.h"
 #include "rtbuf.h"
 
diff --git a/Src/Sound/MPEG/getdata.cpp b/Src/Sound/MPEG/getdata.cpp
index f288b43..28322ff 100644
--- a/Src/Sound/MPEG/getdata.cpp
+++ b/Src/Sound/MPEG/getdata.cpp
@@ -35,7 +35,7 @@
  * Last modified by: tomislav uzelac  Feb 27 1997
  */
 #include "amp.h"
-#include "audio.h"
+#include "amp_audio.h"
 #include "getbits.h"
 #include "huffman.h"
 
diff --git a/Src/Sound/MPEG/huffman.cpp b/Src/Sound/MPEG/huffman.cpp
index 22d67b9..b521ac7 100644
--- a/Src/Sound/MPEG/huffman.cpp
+++ b/Src/Sound/MPEG/huffman.cpp
@@ -35,7 +35,7 @@
  * Last modified by: tomislav uzelac Mar  8 97
  */
 #include <stdlib.h>
-#include "audio.h"
+#include "amp_audio.h"
 #include "getbits.h"
 
 #define HUFFMAN
diff --git a/Src/Sound/MPEG/layer2.cpp b/Src/Sound/MPEG/layer2.cpp
index 6fef380..e06e4ef 100644
--- a/Src/Sound/MPEG/layer2.cpp
+++ b/Src/Sound/MPEG/layer2.cpp
@@ -35,7 +35,7 @@
  * merged with amp, May 19 1997
  */
 #include "amp.h"
-#include "audio.h"
+#include "amp_audio.h"
 #include "getbits.h"
 #include "transform.h"
 
diff --git a/Src/Sound/MPEG/layer3.cpp b/Src/Sound/MPEG/layer3.cpp
index c5d9eaf..9730776 100644
--- a/Src/Sound/MPEG/layer3.cpp
+++ b/Src/Sound/MPEG/layer3.cpp
@@ -35,7 +35,7 @@
  * Last modified by: 
  */
 #include "amp.h"
-#include "audio.h"
+#include "amp_audio.h"
 #include "dump.h"
 #include "getbits.h"
 #include "getdata.h"
diff --git a/Src/Sound/MPEG/misc2.cpp b/Src/Sound/MPEG/misc2.cpp
index 9d31d7c..908f225 100644
--- a/Src/Sound/MPEG/misc2.cpp
+++ b/Src/Sound/MPEG/misc2.cpp
@@ -39,7 +39,7 @@
 #include <string.h>
 
 #include "amp.h"
-#include "audio.h"
+#include "amp_audio.h"
 #include "getdata.h"
 #include "huffman.h"
 
diff --git a/Src/Sound/MPEG/position.cpp b/Src/Sound/MPEG/position.cpp
index 239789d..296489a 100644
--- a/Src/Sound/MPEG/position.cpp
+++ b/Src/Sound/MPEG/position.cpp
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "amp.h"
-#include "audio.h"
+#include "amp_audio.h"
 #include "getbits.h"
 
 #define POSITION
diff --git a/Src/Sound/MPEG/transform.cpp b/Src/Sound/MPEG/transform.cpp
index 08b8b40..a57b4bc 100644
--- a/Src/Sound/MPEG/transform.cpp
+++ b/Src/Sound/MPEG/transform.cpp
@@ -62,7 +62,7 @@
 
 #include <math.h>
 
-#include "audio.h"
+#include "amp_audio.h"
 #include "getdata.h"
 #include "misc2.h"
 
diff --git a/Src/Sound/MPEG/util.cpp b/Src/Sound/MPEG/util.cpp
index 25b2a76..c869193 100644
--- a/Src/Sound/MPEG/util.cpp
+++ b/Src/Sound/MPEG/util.cpp
@@ -44,7 +44,7 @@
 #include <stdarg.h>
 #include <string.h>
 
-#include "audio.h"
+#include "amp_audio.h"
 
 struct debugFlags_t debugFlags;