diff --git a/stepmania/PBProject/Installer/BuildInstaller.cpp b/stepmania/PBProject/Installer/BuildInstaller.cpp
index 044c47e361..d41a17fabd 100644
--- a/stepmania/PBProject/Installer/BuildInstaller.cpp
+++ b/stepmania/PBProject/Installer/BuildInstaller.cpp
@@ -17,8 +17,8 @@ using namespace std;
 #include <cstring>
 #include <stack>
 #include <map>
-#include <sys/errno.h>
-#include <assert.h>
+#include <cerrno>
+#include <cassert>
 #include "StdString.h"
 #include "InstallerFile.h"
 #include "Processor.h"
diff --git a/stepmania/PBProject/Installer/Helper.mm b/stepmania/PBProject/Installer/Helper.mm
index 433edcc2d3..da36047602 100644
--- a/stepmania/PBProject/Installer/Helper.mm
+++ b/stepmania/PBProject/Installer/Helper.mm
@@ -10,7 +10,7 @@
 #import <Security/AuthorizationTags.h>
 #import <sys/types.h>
 #import <sys/wait.h>
-#import <string.h>
+#import <cstring>
 #import <unistd.h>
 #import <fcntl.h>
 #import "Helper.h"
diff --git a/stepmania/PBProject/Installer/InstallerFile.cpp b/stepmania/PBProject/Installer/InstallerFile.cpp
index 444bab5b29..c2f70d0ed0 100644
--- a/stepmania/PBProject/Installer/InstallerFile.cpp
+++ b/stepmania/PBProject/Installer/InstallerFile.cpp
@@ -13,7 +13,7 @@ using namespace std;
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <unistd.h>
-#include <assert.h>
+#include <cassert>
 #include <fcntl.h>
 #include <cstdio>
 #include "StdString.h"
diff --git a/stepmania/PBProject/Installer/Processor.cpp b/stepmania/PBProject/Installer/Processor.cpp
index 1905b64896..8527472428 100644
--- a/stepmania/PBProject/Installer/Processor.cpp
+++ b/stepmania/PBProject/Installer/Processor.cpp
@@ -10,7 +10,7 @@
 using namespace std;
 
 #include <sys/types.h>
-#include <sys/errno.h>
+#include <cerrno.>
 #include <sys/param.h>
 #include <sys/wait.h>
 #include <unistd.h>
diff --git a/stepmania/PBProject/Installer/Util.cpp b/stepmania/PBProject/Installer/Util.cpp
index 1cee7bb293..88da3067a6 100644
--- a/stepmania/PBProject/Installer/Util.cpp
+++ b/stepmania/PBProject/Installer/Util.cpp
@@ -9,7 +9,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/errno.h>
+#include <cerrno>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <dirent.h>
diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index 25dec48515..471ba701d6 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -12,7 +12,6 @@
 */
 
 #include "Actor.h"
-#include <math.h>
 #include "RageDisplay.h"
 #include "PrefsManager.h"
 #include "RageUtil.h"
diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp
index 712a358049..400c550833 100644
--- a/stepmania/src/ActorScroller.cpp
+++ b/stepmania/src/ActorScroller.cpp
@@ -12,11 +12,9 @@
 
 #include "ActorScroller.h"
 #include "ActorCollision.h"
-#include <math.h>
 #include "RageUtil.h"
 #include "RageDisplay.h"
 
-
 ActorScroller::ActorScroller()
 {
 	m_bLoaded = false;
diff --git a/stepmania/src/ArrowEffects.cpp b/stepmania/src/ArrowEffects.cpp
index 1d3ef673dc..76bc69d69c 100644
--- a/stepmania/src/ArrowEffects.cpp
+++ b/stepmania/src/ArrowEffects.cpp
@@ -19,7 +19,6 @@
 #include "RageTimer.h"
 #include "NoteDisplay.h"
 #include "song.h"
-#include <math.h>
 #include "RageMath.h"
 
 const float ARROW_SPACING	= ARROW_SIZE;// + 2;
diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp
index 54e796cd83..52f87f6571 100644
--- a/stepmania/src/BGAnimationLayer.cpp
+++ b/stepmania/src/BGAnimationLayer.cpp
@@ -17,7 +17,6 @@
 #include "IniFile.h"
 #include "RageMath.h"
 #include "SDL_utils.h"
-#include <math.h>
 #include "RageTimer.h"
 #include "RageLog.h"
 #include "song.h"
diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp
index d92999cd2b..5c33993763 100644
--- a/stepmania/src/Background.cpp
+++ b/stepmania/src/Background.cpp
@@ -23,7 +23,6 @@
 #include "PrefsManager.h"
 #include "NoteTypes.h"
 #include "Steps.h"
-#include <math.h>	// for fmodf
 #include "DancingCharacters.h"
 #include "arch/arch.h"
 #include "BeginnerHelper.h"
diff --git a/stepmania/src/Bookkeeper.cpp b/stepmania/src/Bookkeeper.cpp
index fe43ecd3b3..7b1f00a316 100644
--- a/stepmania/src/Bookkeeper.cpp
+++ b/stepmania/src/Bookkeeper.cpp
@@ -19,7 +19,7 @@
 #include "GameConstantsAndTypes.h"
 #include "SongManager.h"
 #include "RageFile.h"
-#include <time.h>
+#include <ctime>
 
 
 Bookkeeper*	BOOKKEEPER = NULL;	// global and accessable from anywhere in our program
diff --git a/stepmania/src/CharacterHead.cpp b/stepmania/src/CharacterHead.cpp
index 7f5a8a02b6..abbc79f964 100644
--- a/stepmania/src/CharacterHead.cpp
+++ b/stepmania/src/CharacterHead.cpp
@@ -16,7 +16,6 @@
 #include "MusicWheel.h"
 #include "CharacterHead.h"
 #include "RageTimer.h"
-#include <math.h>
 #include "ThemeManager.h"
 #include "GameState.h"
 #include "Character.h"
diff --git a/stepmania/src/ConditionalBGA.cpp b/stepmania/src/ConditionalBGA.cpp
index 8e415e757b..e5c5ff2e15 100644
--- a/stepmania/src/ConditionalBGA.cpp
+++ b/stepmania/src/ConditionalBGA.cpp
@@ -1,5 +1,5 @@
 #include "global.h"
-#include <time.h>
+#include <ctime>
 
 #include "GameState.h"
 #include "GameManager.h"
diff --git a/stepmania/src/CourseContentsList.cpp b/stepmania/src/CourseContentsList.cpp
index 58b661784a..c3e1c9e854 100644
--- a/stepmania/src/CourseContentsList.cpp
+++ b/stepmania/src/CourseContentsList.cpp
@@ -18,7 +18,6 @@
 #include "PrefsManager.h"
 #include "Course.h"
 #include "SongManager.h"
-#include <math.h>
 #include "ThemeManager.h"
 #include "Steps.h"
 #include "GameState.h"
diff --git a/stepmania/src/CourseEntryDisplay.cpp b/stepmania/src/CourseEntryDisplay.cpp
index f3e18c242c..35371bbb7b 100644
--- a/stepmania/src/CourseEntryDisplay.cpp
+++ b/stepmania/src/CourseEntryDisplay.cpp
@@ -23,7 +23,6 @@
 #include "GameState.h"
 #include "StyleDef.h"
 #include "ActorUtil.h"
-#include <math.h>
 
 #define SEPARATE_COURSE_METERS		THEME->GetMetricB(m_sName,"SeparateCourseMeters")
 #define TEXT_BANNER_NAME			THEME->GetMetric (m_sName,"TextBannerName")
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index ba7b245ffc..f8ffce61cd 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -34,7 +34,7 @@
 #include "LightsManager.h"
 #include "RageFile.h"
 #include "Bookkeeper.h"
-#include <time.h>
+#include <ctime>
 #include "MemoryCardManager.h"
 #include "StageStats.h"
 #include "GameConstantsAndTypes.h"
diff --git a/stepmania/src/GrooveGraph.cpp b/stepmania/src/GrooveGraph.cpp
index 2ab818c047..3860ffd3ad 100644
--- a/stepmania/src/GrooveGraph.cpp
+++ b/stepmania/src/GrooveGraph.cpp
@@ -21,8 +21,6 @@
 #include "song.h"
 #include "GameState.h"
 #include "StyleDef.h"
-#include <math.h>
-
 
 const float GRAPH_EDGE_WIDTH	= 2;
 
diff --git a/stepmania/src/GrooveRadar.cpp b/stepmania/src/GrooveRadar.cpp
index 4d528ca2f1..0c9041376c 100644
--- a/stepmania/src/GrooveRadar.cpp
+++ b/stepmania/src/GrooveRadar.cpp
@@ -19,8 +19,6 @@
 #include "Steps.h"
 #include "RageDisplay.h"
 #include "RageMath.h"
-#include <math.h>
-
 
 #define LABEL_OFFSET_X( i )			THEME->GetMetricF("GrooveRadar",ssprintf("Label%dOffsetX",i+1))
 #define LABEL_OFFSET_Y( i )			THEME->GetMetricF("GrooveRadar",ssprintf("Label%dOffsetY",i+1))
diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp
index a8d58859ab..c90158f48e 100644
--- a/stepmania/src/LifeMeterBar.cpp
+++ b/stepmania/src/LifeMeterBar.cpp
@@ -15,7 +15,6 @@
 #include "RageException.h"
 #include "RageTimer.h"
 #include "GameState.h"
-#include <math.h>
 #include "RageMath.h"
 #include "ThemeManager.h"
 #include "song.h"
diff --git a/stepmania/src/ListDisplay.cpp b/stepmania/src/ListDisplay.cpp
index 4f4ba41907..926fad997e 100644
--- a/stepmania/src/ListDisplay.cpp
+++ b/stepmania/src/ListDisplay.cpp
@@ -18,7 +18,6 @@
 #include "PrefsManager.h"
 #include "Course.h"
 #include "SongManager.h"
-#include <math.h>
 #include "ThemeManager.h"
 #include "Steps.h"
 #include "GameState.h"
diff --git a/stepmania/src/LuaHelpers.cpp b/stepmania/src/LuaHelpers.cpp
index 1474466fd9..a4ab76dae3 100644
--- a/stepmania/src/LuaHelpers.cpp
+++ b/stepmania/src/LuaHelpers.cpp
@@ -4,8 +4,8 @@
 #include "RageUtil.h"
 #include "RageLog.h"
 
-#include <setjmp.h>
-#include <assert.h>
+#include <csetjmp>
+#include <cassert>
 
 LuaFunctionList *g_LuaFunctionList = NULL;
 
diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp
index 2862fe6c28..3a2d9f86ba 100644
--- a/stepmania/src/Model.cpp
+++ b/stepmania/src/Model.cpp
@@ -19,7 +19,7 @@
 #include "RageFile.h"
 #include "RageLog.h"
 #include "ActorUtil.h"
-#include <errno.h>
+#include <cerrno>
 #include "ModelManager.h"
 
 const float FRAMES_PER_SECOND = 30;
diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 085d15a619..5a53cad04e 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -22,7 +22,6 @@
 #include "GameConstantsAndTypes.h"
 #include "GameState.h"
 #include "RageMath.h"
-#include <math.h>
 #include "ThemeManager.h"
 #include "song.h"
 #include "Course.h"
diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp
index 8a9fff2143..c0aeb33a36 100644
--- a/stepmania/src/MusicWheelItem.cpp
+++ b/stepmania/src/MusicWheelItem.cpp
@@ -21,7 +21,6 @@
 #include "RageLog.h"
 #include "GameConstantsAndTypes.h"
 #include "GameState.h"
-#include <math.h>
 #include "ThemeManager.h"
 #include "Steps.h"
 #include "song.h"
diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp
index db4a6cd5b3..067f5b7211 100644
--- a/stepmania/src/NetworkSyncManager.cpp
+++ b/stepmania/src/NetworkSyncManager.cpp
@@ -25,7 +25,7 @@ Don't bother to edit it.  I will be editing it as I go.
 
 
 #include "global.h"
-#include <string.h>
+#include <cstring>
 #include "NetworkSyncManager.h"
 
 #include "BPMDisplay.h"
diff --git a/stepmania/src/NoteDisplay.cpp b/stepmania/src/NoteDisplay.cpp
index 4b9c6f641c..7b796340ca 100644
--- a/stepmania/src/NoteDisplay.cpp
+++ b/stepmania/src/NoteDisplay.cpp
@@ -21,7 +21,6 @@
 #include "RageException.h"
 #include "ArrowEffects.h"
 #include "RageLog.h"
-#include <math.h>
 #include "RageDisplay.h"
 #include "NoteTypes.h"
 #include "NoteFieldPositioning.h"
diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index e0d6f8f6d0..3b3e3604d6 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -21,7 +21,6 @@
 #include "RageTimer.h"
 #include "RageLog.h"
 #include "RageMath.h"
-#include <math.h>
 #include "ThemeManager.h"
 #include "NoteFieldPositioning.h"
 #include "NoteSkinManager.h"
diff --git a/stepmania/src/NotesWriterSM.cpp b/stepmania/src/NotesWriterSM.cpp
index acaac139b3..ad21a4f7b2 100644
--- a/stepmania/src/NotesWriterSM.cpp
+++ b/stepmania/src/NotesWriterSM.cpp
@@ -5,8 +5,8 @@
 #include "GameManager.h"
 #include "RageLog.h"
 #include "RageFile.h"
-#include <string.h>
-#include <errno.h>
+#include <cstring>
+#include <cerrno>
 
 void NotesWriterSM::WriteGlobalTags( RageFile &f, const Song &out )
 {
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 8280732d14..0cfe4017ca 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -12,7 +12,6 @@
 
 #include "Player.h"
 #include "GameConstantsAndTypes.h"
-#include <math.h> // for fabs()
 #include "RageUtil.h"
 #include "PrefsManager.h"
 #include "GameConstantsAndTypes.h"
diff --git a/stepmania/src/PlayerAI.cpp b/stepmania/src/PlayerAI.cpp
index e577fef4d5..c2521848c5 100644
--- a/stepmania/src/PlayerAI.cpp
+++ b/stepmania/src/PlayerAI.cpp
@@ -15,7 +15,6 @@
 #include "IniFile.h"
 #include "RageException.h"
 #include "GameState.h"
-#include <math.h>
 #include "arch/arch.h"
 
 #define AI_PATH "Data/AI.ini"
diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp
index b16ff04db9..674ba3111e 100644
--- a/stepmania/src/PlayerOptions.cpp
+++ b/stepmania/src/PlayerOptions.cpp
@@ -12,7 +12,6 @@
 
 #include "PlayerOptions.h"
 #include "RageUtil.h"
-#include "math.h"
 #include "RageLog.h"
 
 #include "GameState.h"
diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp
index 5010980414..18bc52e80a 100644
--- a/stepmania/src/Profile.cpp
+++ b/stepmania/src/Profile.cpp
@@ -22,7 +22,7 @@
 #include "SongManager.h"
 #include "Steps.h"
 #include "Course.h"
-#include <time.h>
+#include <ctime>
 #include "ThemeManager.h"
 #include "CryptManager.h"
 #include "ProfileHtml.h"
diff --git a/stepmania/src/ProfileHtml.cpp b/stepmania/src/ProfileHtml.cpp
index 073024f92c..a503685ac1 100644
--- a/stepmania/src/ProfileHtml.cpp
+++ b/stepmania/src/ProfileHtml.cpp
@@ -17,7 +17,7 @@
 #include "SongManager.h"
 #include "song.h"
 #include "Steps.h"
-#include <time.h>
+#include <ctime>
 #include "GameManager.h"
 #include "Course.h"
 #include "Bookkeeper.h"
diff --git a/stepmania/src/RageDisplay_Null.cpp b/stepmania/src/RageDisplay_Null.cpp
index d2295dcd33..40e9a250ae 100644
--- a/stepmania/src/RageDisplay_Null.cpp
+++ b/stepmania/src/RageDisplay_Null.cpp
@@ -26,8 +26,6 @@
 #include "StepMania.h"
 #include "RageUtil.h"
 
-#include <math.h>
-
 static RageDisplay::PixelFormatDesc PIXEL_FORMAT_DESC[RageDisplay::NUM_PIX_FORMATS] = {
 	{
 		/* R8G8B8A8 */
diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp
index 749dd53d51..ada4ed9512 100644
--- a/stepmania/src/RageDisplay_OGL.cpp
+++ b/stepmania/src/RageDisplay_OGL.cpp
@@ -71,8 +71,6 @@ namespace GLExt {
 #include "arch/arch.h"
 #include "arch/LowLevelWindow/LowLevelWindow.h"
 
-#include <math.h>
-
 #ifdef WIN32
 #pragma comment(lib, "opengl32.lib")
 #pragma comment(lib, "glu32.lib")
diff --git a/stepmania/src/RageException.h b/stepmania/src/RageException.h
index 7d44166ce9..311f28f726 100644
--- a/stepmania/src/RageException.h
+++ b/stepmania/src/RageException.h
@@ -12,7 +12,7 @@
 */
 
 #include <exception>
-#include <stdarg.h>
+#include <cstdarg>
 
 class RageException : public exception
 {
diff --git a/stepmania/src/RageFileDriverDirect.cpp b/stepmania/src/RageFileDriverDirect.cpp
index cfcb7880e4..c9ec950420 100644
--- a/stepmania/src/RageFileDriverDirect.cpp
+++ b/stepmania/src/RageFileDriverDirect.cpp
@@ -6,7 +6,7 @@
 #include "RageLog.h"
 
 #include <fcntl.h>
-#include <errno.h>
+#include <cerrno>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/stepmania/src/RageFileDriverDirectHelpers.cpp b/stepmania/src/RageFileDriverDirectHelpers.cpp
index 21e5c2d579..1de22d3bf6 100644
--- a/stepmania/src/RageFileDriverDirectHelpers.cpp
+++ b/stepmania/src/RageFileDriverDirectHelpers.cpp
@@ -3,7 +3,7 @@
 #include "RageUtil.h"
 #include "RageLog.h"
 
-#include <errno.h>
+#include <cerrno>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/stepmania/src/RageFileDriverZip.cpp b/stepmania/src/RageFileDriverZip.cpp
index 430a69ebde..7c5f263a3d 100644
--- a/stepmania/src/RageFileDriverZip.cpp
+++ b/stepmania/src/RageFileDriverZip.cpp
@@ -61,7 +61,7 @@ freely, subject to the following restrictions:
 #include "RageUtil.h"
 #include "RageUtil_FileDB.h"
 
-#include <errno.h>
+#include <cerrno>
 
 #if defined(_WINDOWS) || defined(_XBOX)
 	#include "zlib/zlib.h"
diff --git a/stepmania/src/RageFileManager.cpp b/stepmania/src/RageFileManager.cpp
index 5279d75508..e10f8cb5d7 100644
--- a/stepmania/src/RageFileManager.cpp
+++ b/stepmania/src/RageFileManager.cpp
@@ -7,7 +7,7 @@
 #include "RageLog.h"
 #include "RageThreads.h"
 
-#include <errno.h>
+#include <cerrno>
 #if defined(LINUX)
 #include <sys/stat.h>
 #endif
diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp
index 5ba0fc1f2f..ddead8e1ef 100644
--- a/stepmania/src/RageLog.cpp
+++ b/stepmania/src/RageLog.cpp
@@ -18,7 +18,7 @@
 #include "RageTimer.h"
 #include "RageFile.h"
 #include "RageThreads.h"
-#include <time.h>
+#include <ctime>
 #if defined(_WINDOWS)
 #include "windows.h"
 #endif
diff --git a/stepmania/src/RageMath.cpp b/stepmania/src/RageMath.cpp
index d0a21746ab..49efe58edd 100644
--- a/stepmania/src/RageMath.cpp
+++ b/stepmania/src/RageMath.cpp
@@ -16,7 +16,6 @@
 #include "RageUtil.h"
 #include "RageDisplay.h"
 #include "RageLog.h"
-#include <math.h>
 #include "arch/ArchHooks/ArchHooks.h"
 
 void RageVec3ClearBounds( RageVector3 &mins, RageVector3 &maxs )
diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp
index c05ea7e999..e63fdb4482 100644
--- a/stepmania/src/RageSound.cpp
+++ b/stepmania/src/RageSound.cpp
@@ -29,8 +29,6 @@
 #include "PrefsManager.h"
 #include "arch/ArchHooks/ArchHooks.h"
 
-#include <math.h>
-
 #include "RageSoundReader_Preload.h"
 #include "RageSoundReader_Resample.h"
 #include "RageSoundReader_FileReader.h"
diff --git a/stepmania/src/RageSoundReader_MP3.cpp b/stepmania/src/RageSoundReader_MP3.cpp
index e63ec5868a..ed34620864 100644
--- a/stepmania/src/RageSoundReader_MP3.cpp
+++ b/stepmania/src/RageSoundReader_MP3.cpp
@@ -6,8 +6,8 @@
 #include "RageUtil.h"
 #include "SDL_utils.h"
 
-#include <stdio.h>
-#include <errno.h>
+#include <cstdio>
+#include <cerrno>
 
 #ifdef _WIN32
 #include "mad-0.15.1b/mad.h"
diff --git a/stepmania/src/RageSoundReader_Vorbisfile.cpp b/stepmania/src/RageSoundReader_Vorbisfile.cpp
index 90a5b0e371..38618d3019 100644
--- a/stepmania/src/RageSoundReader_Vorbisfile.cpp
+++ b/stepmania/src/RageSoundReader_Vorbisfile.cpp
@@ -30,8 +30,8 @@
 #pragma comment(lib, "vorbis/win32/vorbisfile_static.lib")
 #endif
 
-#include <string.h>
-#include <errno.h>
+#include <cstring>
+#include <cerrno>
 #include "RageFile.h"
 static size_t OggRageFile_read_func( void *ptr, size_t size, size_t nmemb, void *datasource )
 {
diff --git a/stepmania/src/RageSoundResampler.cpp b/stepmania/src/RageSoundResampler.cpp
index 9d2965c3aa..42ce133ccf 100644
--- a/stepmania/src/RageSoundResampler.cpp
+++ b/stepmania/src/RageSoundResampler.cpp
@@ -2,7 +2,6 @@
 #include "RageSoundResampler.h"
 #include "RageUtil.h"
 #include "RageLog.h"
-#include <math.h>
 
 /*
  * This class handles sound resampling.
diff --git a/stepmania/src/RageTexture.cpp b/stepmania/src/RageTexture.cpp
index 55412b1161..a83430b746 100644
--- a/stepmania/src/RageTexture.cpp
+++ b/stepmania/src/RageTexture.cpp
@@ -12,7 +12,7 @@
 #include "RageTexture.h"
 #include "RageUtil.h"
 #include "RageTextureManager.h"
-#include <string.h>
+#include <cstring>
 
 
 RageTexture::RageTexture( RageTextureID name ):
diff --git a/stepmania/src/RageThreads.cpp b/stepmania/src/RageThreads.cpp
index 3c4551f598..ed98a36f4b 100644
--- a/stepmania/src/RageThreads.cpp
+++ b/stepmania/src/RageThreads.cpp
@@ -19,8 +19,8 @@
 #include "SDL_thread.h"
 #include "SDL_utils.h"
 
-#include <signal.h>
-#include <errno.h>
+#include <csignal>
+#include <cerrno>
 #include <set>
 
 /* SDL threads aren't quite enough.  We need to be able to suspend or
diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp
index 388a02efa8..943651bb55 100644
--- a/stepmania/src/RageUtil.cpp
+++ b/stepmania/src/RageUtil.cpp
@@ -16,8 +16,7 @@
 #include "arch/arch.h"
 
 #include <numeric>
-#include <time.h>
-#include <math.h>
+#include <ctime>
 #include <map>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/stepmania/src/ReceptorArrow.cpp b/stepmania/src/ReceptorArrow.cpp
index c1794778bd..e9bc736402 100644
--- a/stepmania/src/ReceptorArrow.cpp
+++ b/stepmania/src/ReceptorArrow.cpp
@@ -14,7 +14,6 @@
 #include "ReceptorArrow.h"
 #include "PrefsManager.h"
 #include "GameState.h"
-#include <math.h>
 #include "ThemeManager.h"
 #include "NoteFieldPositioning.h"
 #include "NoteSkinManager.h"
diff --git a/stepmania/src/SDL_rotozoom.cpp b/stepmania/src/SDL_rotozoom.cpp
index 8e8121fcc6..0c39d6288f 100644
--- a/stepmania/src/SDL_rotozoom.cpp
+++ b/stepmania/src/SDL_rotozoom.cpp
@@ -7,7 +7,6 @@
 
 #include "SDL_rotozoom.h"
 
-#include <math.h>
 #include <vector>
 using namespace std;
 
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index eaae5a3692..de0433ffd3 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -23,7 +23,6 @@
 #include "GameState.h"
 #include "InputMapper.h"
 #include "RageLog.h"
-#include <math.h>
 #include "ThemeManager.h"
 #include "SDL_keysym.h"		// for SDLKeys
 #include "ScreenMiniMenu.h"
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 6d670091ab..409c261c9c 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -37,7 +37,7 @@
 #include "RageDisplay.h"
 #include "StepMania.h"
 #include "CryptManager.h"
-#include <time.h>
+#include <ctime>
 
 const int NUM_SCORE_DIGITS	=	9;
 
diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp
index 275c355e1c..ba32e87eb1 100644
--- a/stepmania/src/ScreenEz2SelectMusic.cpp
+++ b/stepmania/src/ScreenEz2SelectMusic.cpp
@@ -12,7 +12,6 @@
 */
 
 #include "ScreenEz2SelectMusic.h"
-#include <math.h>
 #include "ScreenManager.h"
 #include "RageSounds.h"
 #include "GameConstantsAndTypes.h"
diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp
index b8a44e7fbe..897c1b3c48 100644
--- a/stepmania/src/ScreenHowToPlay.cpp
+++ b/stepmania/src/ScreenHowToPlay.cpp
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "stdlib.h"
+#include <cstdlib>
 /*
 -----------------------------------------------------------------------------
  Class: ScreenHowToPlay
diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index 1249a22ec1..51d47df0b2 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -24,7 +24,6 @@
 #include "ScreenRanking.h"
 #include "Course.h"
 #include "AnnouncerManager.h"
-#include <math.h>
 #include "ProfileManager.h"
 #include "NoteFieldPositioning.h"
 #include "StageStats.h"
diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index a3f93e56b5..f7fe667e17 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -29,7 +29,6 @@
 #include "AnnouncerManager.h"
 #include "song.h"
 #include "Steps.h"
-#include <math.h>
 #include "ProfileManager.h"
 #include "StageStats.h"
 #include "RageDisplay.h"
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index a32362c288..c934c57bb9 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -25,7 +25,6 @@
 #include "InputMapper.h"
 #include "GameState.h"
 #include "CodeDetector.h"
-#include <math.h>
 #include "GameConstantsAndTypes.h"
 #include "ThemeManager.h"
 #include "Steps.h"
diff --git a/stepmania/src/ScrollBar.cpp b/stepmania/src/ScrollBar.cpp
index c074bb670d..5af3e093f6 100644
--- a/stepmania/src/ScrollBar.cpp
+++ b/stepmania/src/ScrollBar.cpp
@@ -12,7 +12,6 @@
 
 #include "ScrollBar.h"
 #include "GameConstantsAndTypes.h"
-#include <math.h>
 #include "ThemeManager.h"
 
 
diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp
index b7c758424d..92ce8fec9e 100644
--- a/stepmania/src/Sprite.cpp
+++ b/stepmania/src/Sprite.cpp
@@ -10,8 +10,7 @@
 -----------------------------------------------------------------------------
 */
 
-#include <math.h>
-#include <assert.h>
+#include <cassert>
 
 #include "Sprite.h"
 #include "RageTextureManager.h"
diff --git a/stepmania/src/StdString.h b/stepmania/src/StdString.h
index acf4620b59..3f9a006e47 100644
--- a/stepmania/src/StdString.h
+++ b/stepmania/src/StdString.h
@@ -285,19 +285,15 @@ typedef char			TCHAR;
 #ifdef SS_ANSI // Are we doing things the standard, non-Win32 way?...
 	// Not sure if we need all these headers.   I believe ANSI says we do.
 
-	#include <stdio.h>
-	#include <stdarg.h>
-	#include <ctype.h>
-	#include <stdlib.h>
+	#include <cstdio>
+	#include <cctype>
+	#include <cstdlib>
 	#ifndef va_start
 		#include <varargs.h>
 	#endif
 #endif // #ifndef SS_ANSI
 
-// VC++ needs this for va_*. -cdanford
-#ifndef SS_ANSI
-	#include <stdarg.h>
-#endif
+#include <cstdarg>
 
 
 // a very shorthand way of applying the fix for KB problem Q172398
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 83703813af..1e3a2a88b3 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -27,7 +27,7 @@
 
 #include "arch/arch.h"
 #include "arch/LoadingWindow/LoadingWindow.h"
-#include "time.h"
+#include <ctime>
 
 #include "ProductInfo.h"
 
diff --git a/stepmania/src/Steps.cpp b/stepmania/src/Steps.cpp
index bb2bd0e181..58ff11a840 100644
--- a/stepmania/src/Steps.cpp
+++ b/stepmania/src/Steps.cpp
@@ -16,7 +16,6 @@
 #include "song.h"
 #include "Steps.h"
 #include "IniFile.h"
-#include "math.h"	// for fabs()
 #include "RageUtil.h"
 #include "RageLog.h"
 #include "NoteData.h"
diff --git a/stepmania/src/TimeConstants.h b/stepmania/src/TimeConstants.h
index 5c7a0a169c..73629641c9 100644
--- a/stepmania/src/TimeConstants.h
+++ b/stepmania/src/TimeConstants.h
@@ -11,7 +11,7 @@
 -----------------------------------------------------------------------------
 */
 
-#include "time.h"
+#include <ctime>
 
 
 const int NUM_LAST_DAYS = 7;
diff --git a/stepmania/src/WheelNotifyIcon.cpp b/stepmania/src/WheelNotifyIcon.cpp
index e97b976abd..1a74cdab39 100644
--- a/stepmania/src/WheelNotifyIcon.cpp
+++ b/stepmania/src/WheelNotifyIcon.cpp
@@ -16,7 +16,6 @@
 #include "MusicWheel.h"
 #include "WheelNotifyIcon.h"
 #include "RageTimer.h"
-#include <math.h>
 #include "ThemeManager.h"
 
 
diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp
index 2db0e02663..1857c9eccd 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp
@@ -20,7 +20,6 @@
 #include <Carbon/Carbon.h>
 #undef Random_
 #include <mach/thread_act.h>
-#include <signal.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.mm b/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.mm
index 73243ac862..b75b9dfac8 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.mm
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.mm
@@ -8,7 +8,7 @@
  */
 
 /* This is really dumb. I don't know why it is needed all of a sudden */
-#include <math.h>
+#include <cmath>
 #ifndef scalb
 #define scalb(x, n) scalbn(x, n)
 #endif
diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriver_Linux.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriver_Linux.cpp
index 55c6c9d972..504ddaefd1 100644
--- a/stepmania/src/arch/MemoryCard/MemoryCardDriver_Linux.cpp
+++ b/stepmania/src/arch/MemoryCard/MemoryCardDriver_Linux.cpp
@@ -4,9 +4,9 @@
 #include "RageUtil.h"
 #include "RageFileManager.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
+#include <cstdio>
+#include <cstring>
+#include <cerrno>
 #include <unistd.h>
 #include <fcntl.h>
 #include <linux/types.h>
diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
index b6bb1b1c37..dde60e2d3f 100644
--- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
@@ -10,7 +10,7 @@
 #include "SDL_endian.h"
 #include "PrefsManager.h"
 
-#include <errno.h>
+#include <cerrno>
 
 namespace avcodec
 {
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_QT1.cpp b/stepmania/src/arch/Sound/RageSoundDriver_QT1.cpp
index 75d0a440b6..0e598752e5 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_QT1.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_QT1.cpp
@@ -14,7 +14,7 @@
 #include "RageUtil.h"
 #include "RageLog.h"
 #include <QuickTime/QuickTime.h>
-#include <stdlib.h>
+#include <cstdlib>
 /* Ugh */
 using namespace QT;
 
diff --git a/stepmania/src/archutils/Darwin/PublicUtility/CAAutoDisposer.h b/stepmania/src/archutils/Darwin/PublicUtility/CAAutoDisposer.h
index d230c06aa3..0a634f22d5 100644
--- a/stepmania/src/archutils/Darwin/PublicUtility/CAAutoDisposer.h
+++ b/stepmania/src/archutils/Darwin/PublicUtility/CAAutoDisposer.h
@@ -46,7 +46,7 @@
 //	Includes
 //=============================================================================
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <new>
 
 //=============================================================================
diff --git a/stepmania/src/archutils/Darwin/PublicUtility/CAPrefix.h b/stepmania/src/archutils/Darwin/PublicUtility/CAPrefix.h
index 772c720511..81d25fc450 100644
--- a/stepmania/src/archutils/Darwin/PublicUtility/CAPrefix.h
+++ b/stepmania/src/archutils/Darwin/PublicUtility/CAPrefix.h
@@ -61,9 +61,9 @@
 #include <IOKit/audio/IOAudioDefines.h>
 #include <IOKit/audio/IOAudioTypes.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #if defined(__cplusplus)
 	#include <algorithm>
diff --git a/stepmania/src/archutils/Darwin/PublicUtility/CAStreamBasicDescription.h b/stepmania/src/archutils/Darwin/PublicUtility/CAStreamBasicDescription.h
index 4a9093f104..0dd5a962ec 100644
--- a/stepmania/src/archutils/Darwin/PublicUtility/CAStreamBasicDescription.h
+++ b/stepmania/src/archutils/Darwin/PublicUtility/CAStreamBasicDescription.h
@@ -54,8 +54,8 @@
 #endif
 
 #include "CADebugMacros.h"
-#include <string.h>	// for memset, memcpy
-#include <stdio.h>	// for FILE *
+#include <cstring>	// for memset, memcpy
+#include <cstdio>	// for FILE *
 
 //=============================================================================
 //	CAStreamBasicDescription
diff --git a/stepmania/src/archutils/Darwin/wchar.cpp b/stepmania/src/archutils/Darwin/wchar.cpp
index 034c0d1f59..98bcd1e70d 100644
--- a/stepmania/src/archutils/Darwin/wchar.cpp
+++ b/stepmania/src/archutils/Darwin/wchar.cpp
@@ -12,7 +12,7 @@
 #if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3)
 
 #define	_BSD_WCHAR_T_DEFINED_
-#include <stddef.h>
+#include <cstddef>
 #include <string>
 #include <cstring>
 
diff --git a/stepmania/src/archutils/Unix/Backtrace.cpp b/stepmania/src/archutils/Unix/Backtrace.cpp
index f9cc5e6e0c..64db2e1d9a 100644
--- a/stepmania/src/archutils/Unix/Backtrace.cpp
+++ b/stepmania/src/archutils/Unix/Backtrace.cpp
@@ -3,12 +3,12 @@
 #include "RageUtil.h"
 
 #include <unistd.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/ptrace.h>
 #include <sys/stat.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 
 #if defined(BACKTRACE_METHOD_X86_LINUX)
diff --git a/stepmania/src/archutils/Unix/BacktraceNames.cpp b/stepmania/src/archutils/Unix/BacktraceNames.cpp
index f7c37ebb45..ac1b480e38 100644
--- a/stepmania/src/archutils/Unix/BacktraceNames.cpp
+++ b/stepmania/src/archutils/Unix/BacktraceNames.cpp
@@ -3,12 +3,12 @@
 #include "global.h"
 #include "BacktraceNames.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstdarg>
 #include <unistd.h>
-#include <string.h>
-#include <errno.h>
+#include <cstring>
+#include <cerrno>
 
 #include "RageUtil.h"
 
diff --git a/stepmania/src/archutils/Unix/CrashHandler.cpp b/stepmania/src/archutils/Unix/CrashHandler.cpp
index 8a9b049b27..d7fd7c531a 100644
--- a/stepmania/src/archutils/Unix/CrashHandler.cpp
+++ b/stepmania/src/archutils/Unix/CrashHandler.cpp
@@ -1,14 +1,14 @@
 #include "global.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstdarg>
 #include <unistd.h>
-#include <string.h>
-#include <errno.h>
+#include <cstring>
+#include <cerrno>
 #include <limits.h>
 #include <fcntl.h>
-#include <signal.h>
+#include <csignal>
 
 #include "RageLog.h" /* for RageLog::GetAdditionalLog, etc, only */
 #include "RageThreads.h"
diff --git a/stepmania/src/archutils/Unix/CrashHandler.h b/stepmania/src/archutils/Unix/CrashHandler.h
index cbdf84a416..76ed978404 100644
--- a/stepmania/src/archutils/Unix/CrashHandler.h
+++ b/stepmania/src/archutils/Unix/CrashHandler.h
@@ -8,7 +8,7 @@ void CrashHandlerHandleArgs( int argc, char* argv[] );
 void InitializeCrashHandler();
 	
 #if !defined(DARWIN)
-#include <signal.h>
+#include <csignal>
 #include <ucontext.h>
 void CrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *uc );
 #endif
diff --git a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
index db6105fc8e..194ff8d936 100644
--- a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
+++ b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
@@ -1,9 +1,9 @@
 #define __USE_GNU
 #include "global.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
+#include <cstdio>
+#include <cstring>
+#include <cerrno>
 #include <sys/types.h>
 #include <sys/wait.h>
 
diff --git a/stepmania/src/archutils/Unix/SignalHandler.cpp b/stepmania/src/archutils/Unix/SignalHandler.cpp
index 9a12070353..d77a0caabb 100644
--- a/stepmania/src/archutils/Unix/SignalHandler.cpp
+++ b/stepmania/src/archutils/Unix/SignalHandler.cpp
@@ -4,10 +4,10 @@
 #include "SignalHandler.h"
 #include "GetSysInfo.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 #include <sys/mman.h>
-#include <errno.h>
+#include <cerrno>
 
 static vector<SignalHandler::handler> handlers;
 SaveSignals *saved_sigs;
diff --git a/stepmania/src/archutils/Unix/SignalHandler.h b/stepmania/src/archutils/Unix/SignalHandler.h
index 48860d967d..983b58206e 100644
--- a/stepmania/src/archutils/Unix/SignalHandler.h
+++ b/stepmania/src/archutils/Unix/SignalHandler.h
@@ -1,7 +1,7 @@
 #ifndef SIGNAL_HANDLER_H
 #define SIGNAL_HANDLER_H
 
-#include <signal.h>
+#include <csignal>
 #include <ucontext.h>
        
 class SaveSignals
diff --git a/stepmania/src/crypto/CryptSH512.cpp b/stepmania/src/crypto/CryptSH512.cpp
index fea5c1ae06..d19ef4f7c4 100644
--- a/stepmania/src/crypto/CryptSH512.cpp
+++ b/stepmania/src/crypto/CryptSH512.cpp
@@ -284,8 +284,8 @@ void SHA512_Simple(const void *p, int len, unsigned char *output) {
 
 #ifdef TEST
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 int main(void) {
 	unsigned char digest[64];
diff --git a/stepmania/src/global.h b/stepmania/src/global.h
index 6e150e11de..ffcb50d28c 100644
--- a/stepmania/src/global.h
+++ b/stepmania/src/global.h
@@ -129,7 +129,7 @@ void NORETURN sm_crash( const char *reason = "Internal error" );
 #endif
 
 /* Define a few functions if necessary */
-#include <math.h>
+#include <cmath>
 #ifdef NEED_POWF
 inline float powf (float x, float y) { return float(pow(double(x),double(y))); }
 #endif