diff --git a/src/osd/modules/debugger/debugosx.m b/src/osd/modules/debugger/debugosx.mm
similarity index 100%
rename from src/osd/modules/debugger/debugosx.m
rename to src/osd/modules/debugger/debugosx.mm
diff --git a/src/osd/modules/debugger/osx/breakpointsview.m b/src/osd/modules/debugger/osx/breakpointsview.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/breakpointsview.m
rename to src/osd/modules/debugger/osx/breakpointsview.mm
diff --git a/src/osd/modules/debugger/osx/consoleview.m b/src/osd/modules/debugger/osx/consoleview.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/consoleview.m
rename to src/osd/modules/debugger/osx/consoleview.mm
diff --git a/src/osd/modules/debugger/osx/debugcommandhistory.m b/src/osd/modules/debugger/osx/debugcommandhistory.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/debugcommandhistory.m
rename to src/osd/modules/debugger/osx/debugcommandhistory.mm
diff --git a/src/osd/modules/debugger/osx/debugconsole.m b/src/osd/modules/debugger/osx/debugconsole.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/debugconsole.m
rename to src/osd/modules/debugger/osx/debugconsole.mm
diff --git a/src/osd/modules/debugger/osx/debugview.m b/src/osd/modules/debugger/osx/debugview.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/debugview.m
rename to src/osd/modules/debugger/osx/debugview.mm
diff --git a/src/osd/modules/debugger/osx/debugwindowhandler.m b/src/osd/modules/debugger/osx/debugwindowhandler.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/debugwindowhandler.m
rename to src/osd/modules/debugger/osx/debugwindowhandler.mm
diff --git a/src/osd/modules/debugger/osx/deviceinfoviewer.m b/src/osd/modules/debugger/osx/deviceinfoviewer.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/deviceinfoviewer.m
rename to src/osd/modules/debugger/osx/deviceinfoviewer.mm
diff --git a/src/osd/modules/debugger/osx/devicesviewer.m b/src/osd/modules/debugger/osx/devicesviewer.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/devicesviewer.m
rename to src/osd/modules/debugger/osx/devicesviewer.mm
diff --git a/src/osd/modules/debugger/osx/disassemblyview.m b/src/osd/modules/debugger/osx/disassemblyview.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/disassemblyview.m
rename to src/osd/modules/debugger/osx/disassemblyview.mm
diff --git a/src/osd/modules/debugger/osx/disassemblyviewer.m b/src/osd/modules/debugger/osx/disassemblyviewer.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/disassemblyviewer.m
rename to src/osd/modules/debugger/osx/disassemblyviewer.mm
diff --git a/src/osd/modules/debugger/osx/errorlogview.m b/src/osd/modules/debugger/osx/errorlogview.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/errorlogview.m
rename to src/osd/modules/debugger/osx/errorlogview.mm
diff --git a/src/osd/modules/debugger/osx/errorlogviewer.m b/src/osd/modules/debugger/osx/errorlogviewer.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/errorlogviewer.m
rename to src/osd/modules/debugger/osx/errorlogviewer.mm
diff --git a/src/osd/modules/debugger/osx/memoryview.m b/src/osd/modules/debugger/osx/memoryview.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/memoryview.m
rename to src/osd/modules/debugger/osx/memoryview.mm
diff --git a/src/osd/modules/debugger/osx/memoryviewer.m b/src/osd/modules/debugger/osx/memoryviewer.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/memoryviewer.m
rename to src/osd/modules/debugger/osx/memoryviewer.mm
diff --git a/src/osd/modules/debugger/osx/pointsviewer.m b/src/osd/modules/debugger/osx/pointsviewer.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/pointsviewer.m
rename to src/osd/modules/debugger/osx/pointsviewer.mm
diff --git a/src/osd/modules/debugger/osx/registersview.m b/src/osd/modules/debugger/osx/registersview.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/registersview.m
rename to src/osd/modules/debugger/osx/registersview.mm
diff --git a/src/osd/modules/debugger/osx/watchpointsview.m b/src/osd/modules/debugger/osx/watchpointsview.mm
similarity index 100%
rename from src/osd/modules/debugger/osx/watchpointsview.m
rename to src/osd/modules/debugger/osx/watchpointsview.mm
diff --git a/src/osd/sdl/SDLMain_tmpl.m b/src/osd/sdl/SDLMain_tmpl.mm
similarity index 100%
rename from src/osd/sdl/SDLMain_tmpl.m
rename to src/osd/sdl/SDLMain_tmpl.mm
diff --git a/src/osd/sdl/aueffectutil.m b/src/osd/sdl/aueffectutil.mm
similarity index 100%
rename from src/osd/sdl/aueffectutil.m
rename to src/osd/sdl/aueffectutil.mm
diff --git a/src/osd/sdl/osxutils.m b/src/osd/sdl/osxutils.mm
similarity index 100%
rename from src/osd/sdl/osxutils.m
rename to src/osd/sdl/osxutils.mm