Clean up includes.

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"

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"

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"

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>

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>

stepmania/src/Actor.cpp

@@ -12,7 +12,6 @@
 */
 
 #include "Actor.h"
-#include <math.h>
 #include "RageDisplay.h"
 #include "PrefsManager.h"
 #include "RageUtil.h"

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;

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;

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"

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"

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

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"

stepmania/src/ConditionalBGA.cpp

@@ -1,5 +1,5 @@
 #include "global.h"
-#include <time.h>
+#include <ctime>
 
 #include "GameState.h"
 #include "GameManager.h"

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"

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")

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"

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;
 

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))

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"

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"

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;
 

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;

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"

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"

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"

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"

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"

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 )
 {

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"

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"

stepmania/src/PlayerOptions.cpp

@@ -12,7 +12,6 @@
 
 #include "PlayerOptions.h"
 #include "RageUtil.h"
-#include "math.h"
 #include "RageLog.h"
 
 #include "GameState.h"

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"

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"

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 */

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")

stepmania/src/RageException.h

@@ -12,7 +12,7 @@
 */
 
 #include <exception>
-#include <stdarg.h>
+#include <cstdarg>
 
 class RageException : public exception
 {

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>
 

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>
 

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"

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

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

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 )

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"

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"

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 )
 {

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.

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 ):

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

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>

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"

stepmania/src/SDL_rotozoom.cpp

@@ -7,7 +7,6 @@
 
 #include "SDL_rotozoom.h"
 
-#include <math.h>
 #include <vector>
 using namespace std;
 

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"

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;
 

stepmania/src/ScreenEz2SelectMusic.cpp

@@ -12,7 +12,6 @@
 */
 
 #include "ScreenEz2SelectMusic.h"
-#include <math.h>
 #include "ScreenManager.h"
 #include "RageSounds.h"
 #include "GameConstantsAndTypes.h"

stepmania/src/ScreenHowToPlay.cpp

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "stdlib.h"
+#include <cstdlib>
 /*
 -----------------------------------------------------------------------------
  Class: ScreenHowToPlay

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"

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"

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"

stepmania/src/ScrollBar.cpp

@@ -12,7 +12,6 @@
 
 #include "ScrollBar.h"
 #include "GameConstantsAndTypes.h"
-#include <math.h>
 #include "ThemeManager.h"
 
 

stepmania/src/Sprite.cpp

@@ -10,8 +10,7 @@
 -----------------------------------------------------------------------------
 */
 
-#include <math.h>
-#include <assert.h>
+#include <cassert>
 
 #include "Sprite.h"
 #include "RageTextureManager.h"

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

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"
 

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"

stepmania/src/TimeConstants.h

@@ -11,7 +11,7 @@
 -----------------------------------------------------------------------------
 */
 
-#include "time.h"
+#include <ctime>
 
 
 const int NUM_LAST_DAYS = 7;

stepmania/src/WheelNotifyIcon.cpp

@@ -16,7 +16,6 @@
 #include "MusicWheel.h"
 #include "WheelNotifyIcon.h"
 #include "RageTimer.h"
-#include <math.h>
 #include "ThemeManager.h"
 
 

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>
 

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

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>

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
 {

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;
 

stepmania/src/archutils/Darwin/PublicUtility/CAAutoDisposer.h

@@ -46,7 +46,7 @@
 //	Includes
 //=============================================================================
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <new>
 
 //=============================================================================

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>

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

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>
 

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)

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"
 

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"

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

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>
 

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;

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

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];

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