diff --git a/boards/01-222.c b/boards/01-222.cpp
similarity index 100%
rename from boards/01-222.c
rename to boards/01-222.cpp
diff --git a/boards/112.c b/boards/112.cpp
similarity index 100%
rename from boards/112.c
rename to boards/112.cpp
diff --git a/boards/117.c b/boards/117.cpp
similarity index 100%
rename from boards/117.c
rename to boards/117.cpp
diff --git a/boards/164.c b/boards/164.cpp
similarity index 100%
rename from boards/164.c
rename to boards/164.cpp
diff --git a/boards/183.c b/boards/183.cpp
similarity index 100%
rename from boards/183.c
rename to boards/183.cpp
diff --git a/boards/185.c b/boards/185.cpp
similarity index 100%
rename from boards/185.c
rename to boards/185.cpp
diff --git a/boards/186.c b/boards/186.cpp
similarity index 100%
rename from boards/186.c
rename to boards/186.cpp
diff --git a/boards/187.c b/boards/187.cpp
similarity index 100%
rename from boards/187.c
rename to boards/187.cpp
diff --git a/boards/189.c b/boards/189.cpp
similarity index 100%
rename from boards/189.c
rename to boards/189.cpp
diff --git a/boards/199.c b/boards/199.cpp
similarity index 100%
rename from boards/199.c
rename to boards/199.cpp
diff --git a/boards/208.c b/boards/208.cpp
similarity index 100%
rename from boards/208.c
rename to boards/208.cpp
diff --git a/boards/222.c b/boards/222.cpp
similarity index 100%
rename from boards/222.c
rename to boards/222.cpp
diff --git a/boards/235.c b/boards/235.cpp
similarity index 100%
rename from boards/235.c
rename to boards/235.cpp
diff --git a/boards/43.c b/boards/43.cpp
similarity index 100%
rename from boards/43.c
rename to boards/43.cpp
diff --git a/boards/57.c b/boards/57.cpp
similarity index 100%
rename from boards/57.c
rename to boards/57.cpp
diff --git a/boards/603-5052.c b/boards/603-5052.cpp
similarity index 100%
rename from boards/603-5052.c
rename to boards/603-5052.cpp
diff --git a/boards/8157.c b/boards/8157.cpp
similarity index 100%
rename from boards/8157.c
rename to boards/8157.cpp
diff --git a/boards/8237.c b/boards/8237.cpp
similarity index 100%
rename from boards/8237.c
rename to boards/8237.cpp
diff --git a/boards/88.c b/boards/88.cpp
similarity index 100%
rename from boards/88.c
rename to boards/88.cpp
diff --git a/boards/90.c b/boards/90.cpp
similarity index 100%
rename from boards/90.c
rename to boards/90.cpp
diff --git a/boards/95.c b/boards/95.cpp
similarity index 100%
rename from boards/95.c
rename to boards/95.cpp
diff --git a/boards/Makefile.am.inc b/boards/Makefile.am.inc
index 3ee4ea4e..1e7f044a 100644
--- a/boards/Makefile.am.inc
+++ b/boards/Makefile.am.inc
@@ -1 +1,55 @@
-fceu_SOURCES    +=      boards/8237.c boards/h2288.c boards/malee.c boards/novel.c boards/sachen.c boards/simple.c boards/super24.c boards/supervision.c
+fceu_SOURCES += boards/01-222.cpp
+fceu_SOURCES += boards/112.cpp
+fceu_SOURCES += boards/117.cpp
+fceu_SOURCES += boards/164.cpp
+fceu_SOURCES += boards/183.cpp
+fceu_SOURCES += boards/185.cpp
+fceu_SOURCES += boards/186.cpp
+fceu_SOURCES += boards/187.cpp
+fceu_SOURCES += boards/189.cpp
+fceu_SOURCES += boards/199.cpp
+fceu_SOURCES += boards/208.cpp
+fceu_SOURCES += boards/222.cpp
+fceu_SOURCES += boards/235.cpp
+fceu_SOURCES += boards/43.cpp
+fceu_SOURCES += boards/57.cpp
+fceu_SOURCES += boards/603-5052.cpp
+fceu_SOURCES += boards/8157.cpp
+fceu_SOURCES += boards/8237.cpp
+fceu_SOURCES += boards/88.cpp
+fceu_SOURCES += boards/90.cpp
+fceu_SOURCES += boards/95.cpp
+fceu_SOURCES += boards/__dummy_mapper.cpp
+fceu_SOURCES += boards/a9711.cpp
+fceu_SOURCES += boards/addrlatch.cpp
+fceu_SOURCES += boards/bmc13in1jy110.cpp
+fceu_SOURCES += boards/bmc42in1r.cpp
+fceu_SOURCES += boards/bmc64in1nr.cpp
+fceu_SOURCES += boards/bmc70in1.cpp
+fceu_SOURCES += boards/bonza.cpp
+fceu_SOURCES += boards/datalatch.cpp
+fceu_SOURCES += boards/deirom.cpp
+fceu_SOURCES += boards/dream.cpp
+fceu_SOURCES += boards/edu2000.cpp
+fceu_SOURCES += boards/fk23c.cpp
+fceu_SOURCES += boards/h2288.cpp
+fceu_SOURCES += boards/karaoke.cpp
+fceu_SOURCES += boards/kof97.cpp
+fceu_SOURCES += boards/konami-qtai.cpp
+fceu_SOURCES += boards/malee.cpp
+fceu_SOURCES += boards/mapinc.h"
+fceu_SOURCES += boards/mmc1.cpp
+fceu_SOURCES += boards/mmc3.cpp
+fceu_SOURCES += boards/mmc3.h"
+fceu_SOURCES += boards/mmc5.cpp
+fceu_SOURCES += boards/n-c22m.cpp
+fceu_SOURCES += boards/n106.cpp
+fceu_SOURCES += boards/novel.cpp
+fceu_SOURCES += boards/sachen.cpp
+fceu_SOURCES += boards/sheroes.cpp
+fceu_SOURCES += boards/sl1632.cpp
+fceu_SOURCES += boards/subor.cpp
+fceu_SOURCES += boards/super24.cpp
+fceu_SOURCES += boards/supervision.cpp
+fceu_SOURCES += boards/t-262.cpp
+fceu_SOURCES += boards/tengen.cpp
diff --git a/boards/__dummy_mapper.c b/boards/__dummy_mapper.cpp
similarity index 100%
rename from boards/__dummy_mapper.c
rename to boards/__dummy_mapper.cpp
diff --git a/boards/a9711.c b/boards/a9711.cpp
similarity index 100%
rename from boards/a9711.c
rename to boards/a9711.cpp
diff --git a/boards/addrlatch.c b/boards/addrlatch.cpp
similarity index 100%
rename from boards/addrlatch.c
rename to boards/addrlatch.cpp
diff --git a/boards/bmc13in1jy110.c b/boards/bmc13in1jy110.cpp
similarity index 100%
rename from boards/bmc13in1jy110.c
rename to boards/bmc13in1jy110.cpp
diff --git a/boards/bmc42in1r.c b/boards/bmc42in1r.cpp
similarity index 100%
rename from boards/bmc42in1r.c
rename to boards/bmc42in1r.cpp
diff --git a/boards/bmc64in1nr.c b/boards/bmc64in1nr.cpp
similarity index 100%
rename from boards/bmc64in1nr.c
rename to boards/bmc64in1nr.cpp
diff --git a/boards/bmc70in1.c b/boards/bmc70in1.cpp
similarity index 100%
rename from boards/bmc70in1.c
rename to boards/bmc70in1.cpp
diff --git a/boards/bonza.c b/boards/bonza.cpp
similarity index 100%
rename from boards/bonza.c
rename to boards/bonza.cpp
diff --git a/boards/datalatch.c b/boards/datalatch.cpp
similarity index 100%
rename from boards/datalatch.c
rename to boards/datalatch.cpp
diff --git a/boards/deirom.c b/boards/deirom.cpp
similarity index 100%
rename from boards/deirom.c
rename to boards/deirom.cpp
diff --git a/boards/dream.c b/boards/dream.cpp
similarity index 100%
rename from boards/dream.c
rename to boards/dream.cpp
diff --git a/boards/edu2000.c b/boards/edu2000.cpp
similarity index 100%
rename from boards/edu2000.c
rename to boards/edu2000.cpp
diff --git a/boards/fk23c.c b/boards/fk23c.cpp
similarity index 100%
rename from boards/fk23c.c
rename to boards/fk23c.cpp
diff --git a/boards/h2288.c b/boards/h2288.cpp
similarity index 100%
rename from boards/h2288.c
rename to boards/h2288.cpp
diff --git a/boards/karaoke.c b/boards/karaoke.cpp
similarity index 100%
rename from boards/karaoke.c
rename to boards/karaoke.cpp
diff --git a/boards/kof97.c b/boards/kof97.cpp
similarity index 100%
rename from boards/kof97.c
rename to boards/kof97.cpp
diff --git a/boards/konami-qtai.c b/boards/konami-qtai.cpp
similarity index 100%
rename from boards/konami-qtai.c
rename to boards/konami-qtai.cpp
diff --git a/boards/malee.c b/boards/malee.cpp
similarity index 100%
rename from boards/malee.c
rename to boards/malee.cpp
diff --git a/boards/mmc1.c b/boards/mmc1.cpp
similarity index 100%
rename from boards/mmc1.c
rename to boards/mmc1.cpp
diff --git a/boards/mmc3.c b/boards/mmc3.cpp
similarity index 100%
rename from boards/mmc3.c
rename to boards/mmc3.cpp
diff --git a/boards/mmc5.c b/boards/mmc5.cpp
similarity index 100%
rename from boards/mmc5.c
rename to boards/mmc5.cpp
diff --git a/boards/n-c22m.c b/boards/n-c22m.cpp
similarity index 100%
rename from boards/n-c22m.c
rename to boards/n-c22m.cpp
diff --git a/boards/n106.c b/boards/n106.cpp
similarity index 100%
rename from boards/n106.c
rename to boards/n106.cpp
diff --git a/boards/novel.c b/boards/novel.cpp
similarity index 100%
rename from boards/novel.c
rename to boards/novel.cpp
diff --git a/boards/sachen.c b/boards/sachen.cpp
similarity index 100%
rename from boards/sachen.c
rename to boards/sachen.cpp
diff --git a/boards/sheroes.c b/boards/sheroes.cpp
similarity index 100%
rename from boards/sheroes.c
rename to boards/sheroes.cpp
diff --git a/boards/sl1632.c b/boards/sl1632.cpp
similarity index 100%
rename from boards/sl1632.c
rename to boards/sl1632.cpp
diff --git a/boards/subor.c b/boards/subor.cpp
similarity index 100%
rename from boards/subor.c
rename to boards/subor.cpp
diff --git a/boards/super24.c b/boards/super24.cpp
similarity index 100%
rename from boards/super24.c
rename to boards/super24.cpp
diff --git a/boards/supervision.c b/boards/supervision.cpp
similarity index 100%
rename from boards/supervision.c
rename to boards/supervision.cpp
diff --git a/boards/t-262.c b/boards/t-262.cpp
similarity index 100%
rename from boards/t-262.c
rename to boards/t-262.cpp
diff --git a/boards/tengen.c b/boards/tengen.cpp
similarity index 100%
rename from boards/tengen.c
rename to boards/tengen.cpp
diff --git a/drivers/common/Makefile.am.inc b/drivers/common/Makefile.am.inc
index 5d6429c8..626a617d 100644
--- a/drivers/common/Makefile.am.inc
+++ b/drivers/common/Makefile.am.inc
@@ -1 +1 @@
-fceu_SOURCES	+=	drivers/common/args.c drivers/common/cheat.c drivers/common/config.c drivers/common/vidblit.c drivers/common/hq2x.c drivers/common/hq3x.c drivers/common/scale2x.c drivers/common/scale3x.c drivers/common/scalebit.c
+fceu_SOURCES	+=	drivers/common/args.cpp drivers/common/cheat.cpp drivers/common/config.cpp drivers/common/vidblit.cpp drivers/common/hq2x.cpp drivers/common/hq3x.cpp drivers/common/scale2x.cpp drivers/common/scale3x.cpp drivers/common/scalebit.cpp
diff --git a/drivers/common/args.c b/drivers/common/args.cpp
similarity index 100%
rename from drivers/common/args.c
rename to drivers/common/args.cpp
diff --git a/drivers/common/cheat.c b/drivers/common/cheat.cpp
similarity index 100%
rename from drivers/common/cheat.c
rename to drivers/common/cheat.cpp
diff --git a/drivers/common/config.c b/drivers/common/config.cpp
similarity index 100%
rename from drivers/common/config.c
rename to drivers/common/config.cpp
diff --git a/drivers/common/hq2x.c b/drivers/common/hq2x.cpp
similarity index 100%
rename from drivers/common/hq2x.c
rename to drivers/common/hq2x.cpp
diff --git a/drivers/common/hq3x.c b/drivers/common/hq3x.cpp
similarity index 100%
rename from drivers/common/hq3x.c
rename to drivers/common/hq3x.cpp
diff --git a/drivers/common/scale2x.c b/drivers/common/scale2x.cpp
similarity index 100%
rename from drivers/common/scale2x.c
rename to drivers/common/scale2x.cpp
diff --git a/drivers/common/scale3x.c b/drivers/common/scale3x.cpp
similarity index 100%
rename from drivers/common/scale3x.c
rename to drivers/common/scale3x.cpp
diff --git a/drivers/common/scalebit.c b/drivers/common/scalebit.cpp
similarity index 100%
rename from drivers/common/scalebit.c
rename to drivers/common/scalebit.cpp
diff --git a/drivers/common/vidblit.c b/drivers/common/vidblit.cpp
similarity index 100%
rename from drivers/common/vidblit.c
rename to drivers/common/vidblit.cpp
diff --git a/drivers/win/args.c b/drivers/win/args.cpp
similarity index 100%
rename from drivers/win/args.c
rename to drivers/win/args.cpp
diff --git a/drivers/win/aviout.c b/drivers/win/aviout.cpp
similarity index 100%
rename from drivers/win/aviout.c
rename to drivers/win/aviout.cpp
diff --git a/drivers/win/basicbot.c b/drivers/win/basicbot.cpp
similarity index 100%
rename from drivers/win/basicbot.c
rename to drivers/win/basicbot.cpp
diff --git a/drivers/win/cdlogger.c b/drivers/win/cdlogger.cpp
similarity index 100%
rename from drivers/win/cdlogger.c
rename to drivers/win/cdlogger.cpp
diff --git a/drivers/win/cheat.c b/drivers/win/cheat.cpp
similarity index 100%
rename from drivers/win/cheat.c
rename to drivers/win/cheat.cpp
diff --git a/drivers/win/config.c b/drivers/win/config.cpp
similarity index 100%
rename from drivers/win/config.c
rename to drivers/win/config.cpp
diff --git a/drivers/win/debug.c b/drivers/win/debug.cpp
similarity index 100%
rename from drivers/win/debug.c
rename to drivers/win/debug.cpp
diff --git a/drivers/win/debugger.c b/drivers/win/debugger.cpp
similarity index 100%
rename from drivers/win/debugger.c
rename to drivers/win/debugger.cpp
diff --git a/drivers/win/debuggersp.c b/drivers/win/debuggersp.cpp
similarity index 100%
rename from drivers/win/debuggersp.c
rename to drivers/win/debuggersp.cpp
diff --git a/drivers/win/input.c b/drivers/win/input.cpp
similarity index 100%
rename from drivers/win/input.c
rename to drivers/win/input.cpp
diff --git a/drivers/win/joystick.c b/drivers/win/joystick.cpp
similarity index 100%
rename from drivers/win/joystick.c
rename to drivers/win/joystick.cpp
diff --git a/drivers/win/keyboard.c b/drivers/win/keyboard.cpp
similarity index 100%
rename from drivers/win/keyboard.c
rename to drivers/win/keyboard.cpp
diff --git a/drivers/win/log.c b/drivers/win/log.cpp
similarity index 100%
rename from drivers/win/log.c
rename to drivers/win/log.cpp
diff --git a/drivers/win/main.c b/drivers/win/main.cpp
similarity index 95%
rename from drivers/win/main.c
rename to drivers/win/main.cpp
index e433df7d..6de735e1 100644
--- a/drivers/win/main.c
+++ b/drivers/win/main.cpp
@@ -311,13 +311,13 @@ void DoPriority(void)
 
 static int changerecursive=0;
 
-#include "throttle.c"
+#include "throttle.cpp"
 
-#include "sound.c"
-#include "video.c"
-#include "window.c"
-#include "config.c"
-#include "args.c"
+#include "sound.cpp"
+#include "video.cpp"
+#include "window.cpp"
+#include "config.cpp"
+#include "args.cpp"
 
 int DriverInitialize(void)
 {
diff --git a/drivers/win/memview.c b/drivers/win/memview.cpp
similarity index 100%
rename from drivers/win/memview.c
rename to drivers/win/memview.cpp
diff --git a/drivers/win/memviewsp.c b/drivers/win/memviewsp.cpp
similarity index 100%
rename from drivers/win/memviewsp.c
rename to drivers/win/memviewsp.cpp
diff --git a/drivers/win/netplay.c b/drivers/win/netplay.cpp
similarity index 100%
rename from drivers/win/netplay.c
rename to drivers/win/netplay.cpp
diff --git a/drivers/win/ntview.c b/drivers/win/ntview.cpp
similarity index 100%
rename from drivers/win/ntview.c
rename to drivers/win/ntview.cpp
diff --git a/drivers/win/ppuview.c b/drivers/win/ppuview.cpp
similarity index 100%
rename from drivers/win/ppuview.c
rename to drivers/win/ppuview.cpp
diff --git a/drivers/win/pref.c b/drivers/win/pref.cpp
similarity index 100%
rename from drivers/win/pref.c
rename to drivers/win/pref.cpp
diff --git a/drivers/win/sound.c b/drivers/win/sound.cpp
similarity index 96%
rename from drivers/win/sound.c
rename to drivers/win/sound.cpp
index 2500f0dc..8033971e 100644
--- a/drivers/win/sound.c
+++ b/drivers/win/sound.cpp
@@ -743,4 +743,4 @@ void FCEUD_SoundVolumeAdjust(int n)
 	FCEU_DispMessage("Sound volume %d.", soundvolume);
 }
 
-#include "wave.c"
+#include "wave.cpp"
diff --git a/drivers/win/state.c b/drivers/win/state.cpp
similarity index 100%
rename from drivers/win/state.c
rename to drivers/win/state.cpp
diff --git a/drivers/win/throttle.c b/drivers/win/throttle.cpp
similarity index 100%
rename from drivers/win/throttle.c
rename to drivers/win/throttle.cpp
diff --git a/drivers/win/tracer.c b/drivers/win/tracer.cpp
similarity index 100%
rename from drivers/win/tracer.c
rename to drivers/win/tracer.cpp
diff --git a/drivers/win/video.c b/drivers/win/video.cpp
similarity index 100%
rename from drivers/win/video.c
rename to drivers/win/video.cpp
diff --git a/drivers/win/wave.c b/drivers/win/wave.cpp
similarity index 100%
rename from drivers/win/wave.c
rename to drivers/win/wave.cpp
diff --git a/drivers/win/window.c b/drivers/win/window.cpp
similarity index 96%
rename from drivers/win/window.c
rename to drivers/win/window.cpp
index b3ea1e56..315d7c3b 100644
--- a/drivers/win/window.c
+++ b/drivers/win/window.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "state.c"      /* Save/Load state AS */
+#include "state.cpp"      /* Save/Load state AS */
 
 extern char *md5_asciistr(uint8 digest[16]);
 extern FCEUGI *FCEUGameInfo;
diff --git a/input/Makefile.am.inc b/input/Makefile.am.inc
index d73a34f2..de6b3d3c 100755
--- a/input/Makefile.am.inc
+++ b/input/Makefile.am.inc
@@ -1 +1 @@
-fceu_SOURCES	+=	input/cursor.c input/zapper.c input/powerpad.c input/arkanoid.c input/shadow.c input/fkb.c input/fkb.h input/hypershot.c input/mahjong.c input/oekakids.c input/ftrainer.c input/quiz.c input/toprider.c input/bworld.c
+fceu_SOURCES	+=	input/cursor.cpp input/zapper.cpp input/powerpad.cpp input/arkanoid.cpp input/shadow.cpp input/fkb.cpp input/fkb.h input/hypershot.cpp input/mahjong.cpp input/oekakids.cpp input/ftrainer.cpp input/quiz.cpp input/toprider.cpp input/bworld.cpp
diff --git a/input/arkanoid.c b/input/arkanoid.cpp
similarity index 100%
rename from input/arkanoid.c
rename to input/arkanoid.cpp
diff --git a/input/bworld.c b/input/bworld.cpp
similarity index 100%
rename from input/bworld.c
rename to input/bworld.cpp
diff --git a/input/cursor.c b/input/cursor.cpp
similarity index 100%
rename from input/cursor.c
rename to input/cursor.cpp
diff --git a/input/fkb.c b/input/fkb.cpp
similarity index 100%
rename from input/fkb.c
rename to input/fkb.cpp
diff --git a/input/ftrainer.c b/input/ftrainer.cpp
similarity index 100%
rename from input/ftrainer.c
rename to input/ftrainer.cpp
diff --git a/input/hypershot.c b/input/hypershot.cpp
similarity index 100%
rename from input/hypershot.c
rename to input/hypershot.cpp
diff --git a/input/mahjong.c b/input/mahjong.cpp
similarity index 100%
rename from input/mahjong.c
rename to input/mahjong.cpp
diff --git a/input/mouse.c b/input/mouse.cpp
similarity index 100%
rename from input/mouse.c
rename to input/mouse.cpp
diff --git a/input/oekakids.c b/input/oekakids.cpp
similarity index 100%
rename from input/oekakids.c
rename to input/oekakids.cpp
diff --git a/input/powerpad.c b/input/powerpad.cpp
similarity index 100%
rename from input/powerpad.c
rename to input/powerpad.cpp
diff --git a/input/quiz.c b/input/quiz.cpp
similarity index 100%
rename from input/quiz.c
rename to input/quiz.cpp
diff --git a/input/shadow.c b/input/shadow.cpp
similarity index 100%
rename from input/shadow.c
rename to input/shadow.cpp
diff --git a/input/suborkb.c b/input/suborkb.cpp
similarity index 100%
rename from input/suborkb.c
rename to input/suborkb.cpp
diff --git a/input/toprider.c b/input/toprider.cpp
similarity index 100%
rename from input/toprider.c
rename to input/toprider.cpp
diff --git a/input/zapper.c b/input/zapper.cpp
similarity index 100%
rename from input/zapper.c
rename to input/zapper.cpp
diff --git a/mappers/15.c b/mappers/15.cpp
similarity index 100%
rename from mappers/15.c
rename to mappers/15.cpp
diff --git a/mappers/151.c b/mappers/151.cpp
similarity index 100%
rename from mappers/151.c
rename to mappers/151.cpp
diff --git a/mappers/16.c b/mappers/16.cpp
similarity index 100%
rename from mappers/16.c
rename to mappers/16.cpp
diff --git a/mappers/17.c b/mappers/17.cpp
similarity index 100%
rename from mappers/17.c
rename to mappers/17.cpp
diff --git a/mappers/18.c b/mappers/18.cpp
similarity index 100%
rename from mappers/18.c
rename to mappers/18.cpp
diff --git a/mappers/193.c b/mappers/193.cpp
similarity index 100%
rename from mappers/193.c
rename to mappers/193.cpp
diff --git a/mappers/200.c b/mappers/200.cpp
similarity index 100%
rename from mappers/200.c
rename to mappers/200.cpp
diff --git a/mappers/201.c b/mappers/201.cpp
similarity index 100%
rename from mappers/201.c
rename to mappers/201.cpp
diff --git a/mappers/202.c b/mappers/202.cpp
similarity index 100%
rename from mappers/202.c
rename to mappers/202.cpp
diff --git a/mappers/203.c b/mappers/203.cpp
similarity index 100%
rename from mappers/203.c
rename to mappers/203.cpp
diff --git a/mappers/204.c b/mappers/204.cpp
similarity index 100%
rename from mappers/204.c
rename to mappers/204.cpp
diff --git a/mappers/21.c b/mappers/21.cpp
similarity index 100%
rename from mappers/21.c
rename to mappers/21.cpp
diff --git a/mappers/212.c b/mappers/212.cpp
similarity index 100%
rename from mappers/212.c
rename to mappers/212.cpp
diff --git a/mappers/213.c b/mappers/213.cpp
similarity index 100%
rename from mappers/213.c
rename to mappers/213.cpp
diff --git a/mappers/214.c b/mappers/214.cpp
similarity index 100%
rename from mappers/214.c
rename to mappers/214.cpp
diff --git a/mappers/215.c b/mappers/215.cpp
similarity index 100%
rename from mappers/215.c
rename to mappers/215.cpp
diff --git a/mappers/217.c b/mappers/217.cpp
similarity index 100%
rename from mappers/217.c
rename to mappers/217.cpp
diff --git a/mappers/22.c b/mappers/22.cpp
similarity index 100%
rename from mappers/22.c
rename to mappers/22.cpp
diff --git a/mappers/225.c b/mappers/225.cpp
similarity index 100%
rename from mappers/225.c
rename to mappers/225.cpp
diff --git a/mappers/227.c b/mappers/227.cpp
similarity index 100%
rename from mappers/227.c
rename to mappers/227.cpp
diff --git a/mappers/228.c b/mappers/228.cpp
similarity index 100%
rename from mappers/228.c
rename to mappers/228.cpp
diff --git a/mappers/229.c b/mappers/229.cpp
similarity index 100%
rename from mappers/229.c
rename to mappers/229.cpp
diff --git a/mappers/23.c b/mappers/23.cpp
similarity index 100%
rename from mappers/23.c
rename to mappers/23.cpp
diff --git a/mappers/230.c b/mappers/230.cpp
similarity index 100%
rename from mappers/230.c
rename to mappers/230.cpp
diff --git a/mappers/231.c b/mappers/231.cpp
similarity index 100%
rename from mappers/231.c
rename to mappers/231.cpp
diff --git a/mappers/232.c b/mappers/232.cpp
similarity index 100%
rename from mappers/232.c
rename to mappers/232.cpp
diff --git a/mappers/234.c b/mappers/234.cpp
similarity index 100%
rename from mappers/234.c
rename to mappers/234.cpp
diff --git a/mappers/240.c b/mappers/240.cpp
similarity index 100%
rename from mappers/240.c
rename to mappers/240.cpp
diff --git a/mappers/241.c b/mappers/241.cpp
similarity index 100%
rename from mappers/241.c
rename to mappers/241.cpp
diff --git a/mappers/242.c b/mappers/242.cpp
similarity index 100%
rename from mappers/242.c
rename to mappers/242.cpp
diff --git a/mappers/244.c b/mappers/244.cpp
similarity index 100%
rename from mappers/244.c
rename to mappers/244.cpp
diff --git a/mappers/246.c b/mappers/246.cpp
similarity index 100%
rename from mappers/246.c
rename to mappers/246.cpp
diff --git a/mappers/24and26.c b/mappers/24and26.cpp
similarity index 100%
rename from mappers/24and26.c
rename to mappers/24and26.cpp
diff --git a/mappers/25.c b/mappers/25.cpp
similarity index 100%
rename from mappers/25.c
rename to mappers/25.cpp
diff --git a/mappers/255.c b/mappers/255.cpp
similarity index 100%
rename from mappers/255.c
rename to mappers/255.cpp
diff --git a/mappers/27.c b/mappers/27.cpp
similarity index 100%
rename from mappers/27.c
rename to mappers/27.cpp
diff --git a/mappers/32.c b/mappers/32.cpp
similarity index 100%
rename from mappers/32.c
rename to mappers/32.cpp
diff --git a/mappers/33.c b/mappers/33.cpp
similarity index 100%
rename from mappers/33.c
rename to mappers/33.cpp
diff --git a/mappers/40.c b/mappers/40.cpp
similarity index 100%
rename from mappers/40.c
rename to mappers/40.cpp
diff --git a/mappers/41.c b/mappers/41.cpp
similarity index 100%
rename from mappers/41.c
rename to mappers/41.cpp
diff --git a/mappers/42.c b/mappers/42.cpp
similarity index 100%
rename from mappers/42.c
rename to mappers/42.cpp
diff --git a/mappers/43.c b/mappers/43.cpp
similarity index 100%
rename from mappers/43.c
rename to mappers/43.cpp
diff --git a/mappers/46.c b/mappers/46.cpp
similarity index 100%
rename from mappers/46.c
rename to mappers/46.cpp
diff --git a/mappers/50.c b/mappers/50.cpp
similarity index 100%
rename from mappers/50.c
rename to mappers/50.cpp
diff --git a/mappers/51.c b/mappers/51.cpp
similarity index 100%
rename from mappers/51.c
rename to mappers/51.cpp
diff --git a/mappers/59.c b/mappers/59.cpp
similarity index 100%
rename from mappers/59.c
rename to mappers/59.cpp
diff --git a/mappers/6.c b/mappers/6.cpp
similarity index 100%
rename from mappers/6.c
rename to mappers/6.cpp
diff --git a/mappers/60.c b/mappers/60.cpp
similarity index 100%
rename from mappers/60.c
rename to mappers/60.cpp
diff --git a/mappers/61.c b/mappers/61.cpp
similarity index 100%
rename from mappers/61.c
rename to mappers/61.cpp
diff --git a/mappers/62.c b/mappers/62.cpp
similarity index 100%
rename from mappers/62.c
rename to mappers/62.cpp
diff --git a/mappers/65.c b/mappers/65.cpp
similarity index 100%
rename from mappers/65.c
rename to mappers/65.cpp
diff --git a/mappers/67.c b/mappers/67.cpp
similarity index 100%
rename from mappers/67.c
rename to mappers/67.cpp
diff --git a/mappers/68.c b/mappers/68.cpp
similarity index 100%
rename from mappers/68.c
rename to mappers/68.cpp
diff --git a/mappers/69.c b/mappers/69.cpp
similarity index 100%
rename from mappers/69.c
rename to mappers/69.cpp
diff --git a/mappers/71.c b/mappers/71.cpp
similarity index 100%
rename from mappers/71.c
rename to mappers/71.cpp
diff --git a/mappers/72.c b/mappers/72.cpp
similarity index 100%
rename from mappers/72.c
rename to mappers/72.cpp
diff --git a/mappers/73.c b/mappers/73.cpp
similarity index 100%
rename from mappers/73.c
rename to mappers/73.cpp
diff --git a/mappers/75.c b/mappers/75.cpp
similarity index 100%
rename from mappers/75.c
rename to mappers/75.cpp
diff --git a/mappers/76.c b/mappers/76.cpp
similarity index 100%
rename from mappers/76.c
rename to mappers/76.cpp
diff --git a/mappers/77.c b/mappers/77.cpp
similarity index 100%
rename from mappers/77.c
rename to mappers/77.cpp
diff --git a/mappers/79.c b/mappers/79.cpp
similarity index 100%
rename from mappers/79.c
rename to mappers/79.cpp
diff --git a/mappers/8.c b/mappers/8.cpp
similarity index 100%
rename from mappers/8.c
rename to mappers/8.cpp
diff --git a/mappers/80.c b/mappers/80.cpp
similarity index 100%
rename from mappers/80.c
rename to mappers/80.cpp
diff --git a/mappers/82.c b/mappers/82.cpp
similarity index 100%
rename from mappers/82.c
rename to mappers/82.cpp
diff --git a/mappers/83.c b/mappers/83.cpp
similarity index 100%
rename from mappers/83.c
rename to mappers/83.cpp
diff --git a/mappers/85.c b/mappers/85.cpp
similarity index 100%
rename from mappers/85.c
rename to mappers/85.cpp
diff --git a/mappers/86.c b/mappers/86.cpp
similarity index 100%
rename from mappers/86.c
rename to mappers/86.cpp
diff --git a/mappers/89.c b/mappers/89.cpp
similarity index 100%
rename from mappers/89.c
rename to mappers/89.cpp
diff --git a/mappers/91.c b/mappers/91.cpp
similarity index 100%
rename from mappers/91.c
rename to mappers/91.cpp
diff --git a/mappers/92.c b/mappers/92.cpp
similarity index 100%
rename from mappers/92.c
rename to mappers/92.cpp
diff --git a/mappers/97.c b/mappers/97.cpp
similarity index 100%
rename from mappers/97.c
rename to mappers/97.cpp
diff --git a/mappers/99.c b/mappers/99.cpp
similarity index 100%
rename from mappers/99.c
rename to mappers/99.cpp
diff --git a/mappers/Makefile.am.inc b/mappers/Makefile.am.inc
index a063cf79..6f27988a 100644
--- a/mappers/Makefile.am.inc
+++ b/mappers/Makefile.am.inc
@@ -1 +1,79 @@
-fceu_SOURCES	+=	mappers/mmc2and4.c mappers/simple.c mappers/112.c mappers/117.c mappers/15.c mappers/151.c mappers/16.c mappers/17.c mappers/18.c mappers/180.c mappers/184.c  mappers/21.c mappers/22.c mappers/225.c mappers/226.c mappers/228.c mappers/229.c mappers/23.c mappers/24and26.c mappers/240.c mappers/246.c mappers/25.c mappers/32.c mappers/33.c mappers/40.c mappers/41.c mappers/6.c mappers/65.c mappers/67.c mappers/68.c mappers/69.c mappers/71.c mappers/73.c mappers/75.c mappers/76.c mappers/79.c mappers/8.c mappers/80.c mappers/85.c mappers/95.c mappers/97.c mappers/99.c mappers/182.c mappers/46.c mappers/43.c mappers/42.c mappers/113.c mappers/86.c mappers/89.c mappers/83.c mappers/77.c mappers/92.c mappers/88.c mappers/248.c mappers/emu2413.c mappers/242.c mappers/232.c mappers/72.c mappers/234.c mappers/227.c mappers/82.c mappers/189.c mappers/51.c mappers/91.c mappers/114.c mappers/241.c mappers/235.c mappers/57.c mappers/255.c mappers/61.c mappers/59.c mappers/193.c mappers/50.c mappers/60.c mappers/62.c mappers/244.c mappers/230.c mappers/200.c mappers/201.c mappers/202.c mappers/203.c mappers/231.c mappers/208.c mappers/58.c mappers/187.c
+fceu_SOURCES +=	mappers/emu2413.c 
+
+fceu_SOURCES += mappers/15.cpp
+fceu_SOURCES += mappers/151.cpp
+fceu_SOURCES += mappers/16.cpp
+fceu_SOURCES += mappers/17.cpp
+fceu_SOURCES += mappers/18.cpp
+fceu_SOURCES += mappers/193.cpp
+fceu_SOURCES += mappers/200.cpp
+fceu_SOURCES += mappers/201.cpp
+fceu_SOURCES += mappers/202.cpp
+fceu_SOURCES += mappers/203.cpp
+fceu_SOURCES += mappers/204.cpp
+fceu_SOURCES += mappers/21.cpp
+fceu_SOURCES += mappers/212.cpp
+fceu_SOURCES += mappers/213.cpp
+fceu_SOURCES += mappers/214.cpp
+fceu_SOURCES += mappers/215.cpp
+fceu_SOURCES += mappers/217.cpp
+fceu_SOURCES += mappers/22.cpp
+fceu_SOURCES += mappers/225.cpp
+fceu_SOURCES += mappers/227.cpp
+fceu_SOURCES += mappers/228.cpp
+fceu_SOURCES += mappers/229.cpp
+fceu_SOURCES += mappers/23.cpp
+fceu_SOURCES += mappers/230.cpp
+fceu_SOURCES += mappers/231.cpp
+fceu_SOURCES += mappers/232.cpp
+fceu_SOURCES += mappers/234.cpp
+fceu_SOURCES += mappers/240.cpp
+fceu_SOURCES += mappers/241.cpp
+fceu_SOURCES += mappers/242.cpp
+fceu_SOURCES += mappers/244.cpp
+fceu_SOURCES += mappers/246.cpp
+fceu_SOURCES += mappers/24and26.cpp
+fceu_SOURCES += mappers/25.cpp
+fceu_SOURCES += mappers/255.cpp
+fceu_SOURCES += mappers/27.cpp
+fceu_SOURCES += mappers/32.cpp
+fceu_SOURCES += mappers/33.cpp
+fceu_SOURCES += mappers/40.cpp
+fceu_SOURCES += mappers/41.cpp
+fceu_SOURCES += mappers/42.cpp
+fceu_SOURCES += mappers/43.cpp
+fceu_SOURCES += mappers/46.cpp
+fceu_SOURCES += mappers/50.cpp
+fceu_SOURCES += mappers/51.cpp
+fceu_SOURCES += mappers/59.cpp
+fceu_SOURCES += mappers/6.cpp
+fceu_SOURCES += mappers/60.cpp
+fceu_SOURCES += mappers/61.cpp
+fceu_SOURCES += mappers/62.cpp
+fceu_SOURCES += mappers/65.cpp
+fceu_SOURCES += mappers/67.cpp
+fceu_SOURCES += mappers/68.cpp
+fceu_SOURCES += mappers/69.cpp
+fceu_SOURCES += mappers/71.cpp
+fceu_SOURCES += mappers/72.cpp
+fceu_SOURCES += mappers/73.cpp
+fceu_SOURCES += mappers/75.cpp
+fceu_SOURCES += mappers/76.cpp
+fceu_SOURCES += mappers/77.cpp
+fceu_SOURCES += mappers/79.cpp
+fceu_SOURCES += mappers/8.cpp
+fceu_SOURCES += mappers/80.cpp
+fceu_SOURCES += mappers/82.cpp
+fceu_SOURCES += mappers/83.cpp
+fceu_SOURCES += mappers/85.cpp
+fceu_SOURCES += mappers/86.cpp
+fceu_SOURCES += mappers/89.cpp
+fceu_SOURCES += mappers/91.cpp
+fceu_SOURCES += mappers/92.cpp
+fceu_SOURCES += mappers/97.cpp
+fceu_SOURCES += mappers/99.cpp
+fceu_SOURCES += mappers/__226.cpp
+fceu_SOURCES += mappers/mmc2and4.cpp
+fceu_SOURCES += mappers/simple.cpp
+
+
diff --git a/mappers/__226.c b/mappers/__226.cpp
similarity index 100%
rename from mappers/__226.c
rename to mappers/__226.cpp
diff --git a/mappers/mmc2and4.c b/mappers/mmc2and4.cpp
similarity index 100%
rename from mappers/mmc2and4.c
rename to mappers/mmc2and4.cpp
diff --git a/mappers/simple.c b/mappers/simple.cpp
similarity index 100%
rename from mappers/simple.c
rename to mappers/simple.cpp