diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index 535fde8676..1e86c7bd4a 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"	// testing updates
+#include "global.h"	// testing updates
 /*
 -----------------------------------------------------------------------------
  Class: Actor
diff --git a/stepmania/src/ActorFrame.cpp b/stepmania/src/ActorFrame.cpp
index 4d1cc96591..09a5a7c611 100644
--- a/stepmania/src/ActorFrame.cpp
+++ b/stepmania/src/ActorFrame.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"	// testing updates
+#include "global.h"	// testing updates
 /*
 -----------------------------------------------------------------------------
  Class: ActorFrame
diff --git a/stepmania/src/AnnouncerManager.cpp b/stepmania/src/AnnouncerManager.cpp
index 1232a03d2e..0fbe9b7643 100644
--- a/stepmania/src/AnnouncerManager.cpp
+++ b/stepmania/src/AnnouncerManager.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: AnnouncerManager
diff --git a/stepmania/src/ArrowEffects.cpp b/stepmania/src/ArrowEffects.cpp
index f5e5090a16..6b11a00d0f 100644
--- a/stepmania/src/ArrowEffects.cpp
+++ b/stepmania/src/ArrowEffects.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: ArrowEffects.cpp
diff --git a/stepmania/src/BGAnimation.cpp b/stepmania/src/BGAnimation.cpp
index 1db8e53bef..37e798493e 100644
--- a/stepmania/src/BGAnimation.cpp
+++ b/stepmania/src/BGAnimation.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: BGAnimation
diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp
index 0165e0bb5e..3ecc5d4ca6 100644
--- a/stepmania/src/BGAnimationLayer.cpp
+++ b/stepmania/src/BGAnimationLayer.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: BGAnimation
diff --git a/stepmania/src/BPMDisplay.cpp b/stepmania/src/BPMDisplay.cpp
index b2dab3d341..54e991a771 100644
--- a/stepmania/src/BPMDisplay.cpp
+++ b/stepmania/src/BPMDisplay.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: BPMDisplay.h
diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp
index d126d4a641..e9a21b3126 100644
--- a/stepmania/src/Background.cpp
+++ b/stepmania/src/Background.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: Background
diff --git a/stepmania/src/Banner.cpp b/stepmania/src/Banner.cpp
index 9b5d3f9acb..339e350947 100644
--- a/stepmania/src/Banner.cpp
+++ b/stepmania/src/Banner.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: Banner.h
diff --git a/stepmania/src/BannerWithFrame.cpp b/stepmania/src/BannerWithFrame.cpp
index 8924442a22..54eaa88a65 100644
--- a/stepmania/src/BannerWithFrame.cpp
+++ b/stepmania/src/BannerWithFrame.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: BannerWithFrame
diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp
index a44dd0e316..d07e9530ac 100644
--- a/stepmania/src/BitmapText.cpp
+++ b/stepmania/src/BitmapText.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: BitmapText
diff --git a/stepmania/src/CodeDetector.cpp b/stepmania/src/CodeDetector.cpp
index e3a4fa1529..278370184d 100644
--- a/stepmania/src/CodeDetector.cpp
+++ b/stepmania/src/CodeDetector.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: Course
diff --git a/stepmania/src/Combo.cpp b/stepmania/src/Combo.cpp
index e264e81cda..0ac40340a4 100644
--- a/stepmania/src/Combo.cpp
+++ b/stepmania/src/Combo.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: Combo
diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp
index afdda26150..dbfad253b6 100644
--- a/stepmania/src/Course.cpp
+++ b/stepmania/src/Course.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: Course
diff --git a/stepmania/src/CourseContentsFrame.cpp b/stepmania/src/CourseContentsFrame.cpp
index 1a4b0b5326..548f81f8b0 100644
--- a/stepmania/src/CourseContentsFrame.cpp
+++ b/stepmania/src/CourseContentsFrame.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: CourseContentsFrame
diff --git a/stepmania/src/CroppedSprite.cpp b/stepmania/src/CroppedSprite.cpp
index 4b0472da46..3220b32c7f 100644
--- a/stepmania/src/CroppedSprite.cpp
+++ b/stepmania/src/CroppedSprite.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: CroppedSprite.h
diff --git a/stepmania/src/DifficultyIcon.cpp b/stepmania/src/DifficultyIcon.cpp
index 6cb4af3719..934f22333c 100644
--- a/stepmania/src/DifficultyIcon.cpp
+++ b/stepmania/src/DifficultyIcon.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: DifficultyIcon
diff --git a/stepmania/src/DifficultyRating.cpp b/stepmania/src/DifficultyRating.cpp
index 0ea04258ab..5489d7a04f 100644
--- a/stepmania/src/DifficultyRating.cpp
+++ b/stepmania/src/DifficultyRating.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 #include "DifficultyRating.h"
 #include "ThemeManager.h"
 #include "RageUtil.h"
diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp
index 56e6f46270..bcdd7a037e 100644
--- a/stepmania/src/EditMenu.cpp
+++ b/stepmania/src/EditMenu.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: EditMenu
diff --git a/stepmania/src/FadingBanner.cpp b/stepmania/src/FadingBanner.cpp
index 6463806a2a..97e0065122 100644
--- a/stepmania/src/FadingBanner.cpp
+++ b/stepmania/src/FadingBanner.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: FadingBanner
diff --git a/stepmania/src/FocusingSprite.cpp b/stepmania/src/FocusingSprite.cpp
index 15bb5e1e2e..0bdaaf23c9 100644
--- a/stepmania/src/FocusingSprite.cpp
+++ b/stepmania/src/FocusingSprite.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: FocusingSprite.h
diff --git a/stepmania/src/Font.cpp b/stepmania/src/Font.cpp
index b87eaf713c..b594d1e280 100644
--- a/stepmania/src/Font.cpp
+++ b/stepmania/src/Font.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: Font
diff --git a/stepmania/src/FontCharAliases.cpp b/stepmania/src/FontCharAliases.cpp
index c39681fa68..c1bf27106d 100644
--- a/stepmania/src/FontCharAliases.cpp
+++ b/stepmania/src/FontCharAliases.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 #include "FontCharAliases.h"
 #include "Font.h"
 #include "RageUtil.h"
diff --git a/stepmania/src/FontCharmaps.cpp b/stepmania/src/FontCharmaps.cpp
index 36432b2fdf..7e48ac1e34 100644
--- a/stepmania/src/FontCharmaps.cpp
+++ b/stepmania/src/FontCharmaps.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 #include "FontCharmaps.h"
 
 #include <map>
diff --git a/stepmania/src/FontManager.cpp b/stepmania/src/FontManager.cpp
index 6f510beccf..de2ea0336c 100644
--- a/stepmania/src/FontManager.cpp
+++ b/stepmania/src/FontManager.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: FontManager
diff --git a/stepmania/src/FootMeter.cpp b/stepmania/src/FootMeter.cpp
index 1cab6cac7e..0b2810f372 100644
--- a/stepmania/src/FootMeter.cpp
+++ b/stepmania/src/FootMeter.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: FootMeter
diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp
index 85ca34a922..051a21666c 100644
--- a/stepmania/src/GameConstantsAndTypes.cpp
+++ b/stepmania/src/GameConstantsAndTypes.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: GameConstantsAndTypes.cpp
diff --git a/stepmania/src/GameDef.cpp b/stepmania/src/GameDef.cpp
index 7d8d97255b..7782bbb241 100644
--- a/stepmania/src/GameDef.cpp
+++ b/stepmania/src/GameDef.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: GameDef
diff --git a/stepmania/src/GameInput.cpp b/stepmania/src/GameInput.cpp
index dd8d84101d..33d7fb6cc3 100644
--- a/stepmania/src/GameInput.cpp
+++ b/stepmania/src/GameInput.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: GameInput
diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp
index 547519ddde..a83f1eebbe 100644
--- a/stepmania/src/GameManager.cpp
+++ b/stepmania/src/GameManager.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: GameManager
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index f687097003..af095ce2bc 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: GameState
diff --git a/stepmania/src/GhostArrow.cpp b/stepmania/src/GhostArrow.cpp
index 9c38ef20e0..6d52e561d8 100644
--- a/stepmania/src/GhostArrow.cpp
+++ b/stepmania/src/GhostArrow.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: GhostArrow
diff --git a/stepmania/src/GhostArrowBright.cpp b/stepmania/src/GhostArrowBright.cpp
index 726663e763..ea54705c82 100644
--- a/stepmania/src/GhostArrowBright.cpp
+++ b/stepmania/src/GhostArrowBright.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: GhostArrowBright
diff --git a/stepmania/src/GhostArrowRow.cpp b/stepmania/src/GhostArrowRow.cpp
index 9ee4ab3bd7..f5022fdebe 100644
--- a/stepmania/src/GhostArrowRow.cpp
+++ b/stepmania/src/GhostArrowRow.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: GhostArrowRow
diff --git a/stepmania/src/Grade.cpp b/stepmania/src/Grade.cpp
index 1ad3765b53..0758db787e 100644
--- a/stepmania/src/Grade.cpp
+++ b/stepmania/src/Grade.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: Grade
diff --git a/stepmania/src/GradeDisplay.cpp b/stepmania/src/GradeDisplay.cpp
index fb7ca7b2e7..fb739dbc60 100644
--- a/stepmania/src/GradeDisplay.cpp
+++ b/stepmania/src/GradeDisplay.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: GradeDisplay
diff --git a/stepmania/src/GrayArrow.cpp b/stepmania/src/GrayArrow.cpp
index 1f881a3eb2..2f9ea6fba5 100644
--- a/stepmania/src/GrayArrow.cpp
+++ b/stepmania/src/GrayArrow.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: GrayArrow
diff --git a/stepmania/src/GrayArrowRow.cpp b/stepmania/src/GrayArrowRow.cpp
index 335df1ae94..d05f4c6e1b 100644
--- a/stepmania/src/GrayArrowRow.cpp
+++ b/stepmania/src/GrayArrowRow.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: GrayArrowRow
diff --git a/stepmania/src/GrooveRadar.cpp b/stepmania/src/GrooveRadar.cpp
index 527f85e75b..b6909a1c64 100644
--- a/stepmania/src/GrooveRadar.cpp
+++ b/stepmania/src/GrooveRadar.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: GrooveRadar
diff --git a/stepmania/src/GroupList.cpp b/stepmania/src/GroupList.cpp
index 5d57bc3984..7dcd75be22 100644
--- a/stepmania/src/GroupList.cpp
+++ b/stepmania/src/GroupList.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 #include "GroupList.h"
 #include "ThemeManager.h"
 #include "SongManager.h"
diff --git a/stepmania/src/HoldGhostArrow.cpp b/stepmania/src/HoldGhostArrow.cpp
index 478f1345c1..ca15285f86 100644
--- a/stepmania/src/HoldGhostArrow.cpp
+++ b/stepmania/src/HoldGhostArrow.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: HoldGhostArrow
diff --git a/stepmania/src/HoldJudgement.cpp b/stepmania/src/HoldJudgement.cpp
index 8073a90e0f..2e325d9099 100644
--- a/stepmania/src/HoldJudgement.cpp
+++ b/stepmania/src/HoldJudgement.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: HoldJudgement
diff --git a/stepmania/src/IniFile.cpp b/stepmania/src/IniFile.cpp
index 02846800bc..d95bfa4883 100644
--- a/stepmania/src/IniFile.cpp
+++ b/stepmania/src/IniFile.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: IniFile
diff --git a/stepmania/src/InputFilter.cpp b/stepmania/src/InputFilter.cpp
index 07e3b6784d..42c48b3d6c 100644
--- a/stepmania/src/InputFilter.cpp
+++ b/stepmania/src/InputFilter.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: InputFilter
diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index b0dcf44a74..d7e244c87d 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: InputMapper
diff --git a/stepmania/src/InputQueue.cpp b/stepmania/src/InputQueue.cpp
index ad6fb23821..4ee2e47db2 100644
--- a/stepmania/src/InputQueue.cpp
+++ b/stepmania/src/InputQueue.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: InputQueue
diff --git a/stepmania/src/Judgement.cpp b/stepmania/src/Judgement.cpp
index 096c5e961a..1219d64a72 100644
--- a/stepmania/src/Judgement.cpp
+++ b/stepmania/src/Judgement.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: Judgement
diff --git a/stepmania/src/JukeboxMenu.cpp b/stepmania/src/JukeboxMenu.cpp
index 52d800b5f6..a31f97f9d6 100644
--- a/stepmania/src/JukeboxMenu.cpp
+++ b/stepmania/src/JukeboxMenu.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: JukeboxMenu
diff --git a/stepmania/src/LifeMeter.cpp b/stepmania/src/LifeMeter.cpp
index 951820b00b..052f5c404a 100644
--- a/stepmania/src/LifeMeter.cpp
+++ b/stepmania/src/LifeMeter.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: LifeMeter
diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp
index 06c7cf6e79..cd05e43d98 100644
--- a/stepmania/src/LifeMeterBar.cpp
+++ b/stepmania/src/LifeMeterBar.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: LifeMeterBar
diff --git a/stepmania/src/LifeMeterBattery.cpp b/stepmania/src/LifeMeterBattery.cpp
index 728d40b34e..089b0eb594 100644
--- a/stepmania/src/LifeMeterBattery.cpp
+++ b/stepmania/src/LifeMeterBattery.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: LifeMeterBattery
diff --git a/stepmania/src/MenuElements.cpp b/stepmania/src/MenuElements.cpp
index 833121c374..a3424866e4 100644
--- a/stepmania/src/MenuElements.cpp
+++ b/stepmania/src/MenuElements.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: MenuElements.h
diff --git a/stepmania/src/MenuTimer.cpp b/stepmania/src/MenuTimer.cpp
index 05442c6253..7de6bc4cec 100644
--- a/stepmania/src/MenuTimer.cpp
+++ b/stepmania/src/MenuTimer.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: MenuTimer
diff --git a/stepmania/src/MotionBlurSprite.cpp b/stepmania/src/MotionBlurSprite.cpp
index 4827cc838b..ae4832ed38 100644
--- a/stepmania/src/MotionBlurSprite.cpp
+++ b/stepmania/src/MotionBlurSprite.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: MotionBlurSprite
diff --git a/stepmania/src/MsdFile.cpp b/stepmania/src/MsdFile.cpp
index 9a8962ede9..2d253873bd 100644
--- a/stepmania/src/MsdFile.cpp
+++ b/stepmania/src/MsdFile.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: MsdFile
diff --git a/stepmania/src/MusicBannerWheel.cpp b/stepmania/src/MusicBannerWheel.cpp
index a9037c12b2..b2aa24c538 100644
--- a/stepmania/src/MusicBannerWheel.cpp
+++ b/stepmania/src/MusicBannerWheel.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: MusicBannerWheel
diff --git a/stepmania/src/MusicList.cpp b/stepmania/src/MusicList.cpp
index 40751251e5..ca2b4ae78f 100644
--- a/stepmania/src/MusicList.cpp
+++ b/stepmania/src/MusicList.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 #include "MusicList.h"
 #include "ThemeManager.h"
 
diff --git a/stepmania/src/MusicSortDisplay.cpp b/stepmania/src/MusicSortDisplay.cpp
index 904d4ca648..2cbf991732 100644
--- a/stepmania/src/MusicSortDisplay.cpp
+++ b/stepmania/src/MusicSortDisplay.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: MusicSortDisplay
diff --git a/stepmania/src/MusicStatusDisplay.cpp b/stepmania/src/MusicStatusDisplay.cpp
index 5122abc45a..e0133b6eb3 100644
--- a/stepmania/src/MusicStatusDisplay.cpp
+++ b/stepmania/src/MusicStatusDisplay.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: MusicStatusDisplay
diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index ed88085e0e..8edcd4071b 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: MusicWheelItem
diff --git a/stepmania/src/MusicWheelItem.cpp b/stepmania/src/MusicWheelItem.cpp
index bae14bfd2d..7ae060fc7b 100644
--- a/stepmania/src/MusicWheelItem.cpp
+++ b/stepmania/src/MusicWheelItem.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: MusicWheelItem
diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index fb5a5de3d3..dde3864689 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: NoteData
diff --git a/stepmania/src/NoteDataWithScoring.cpp b/stepmania/src/NoteDataWithScoring.cpp
index e892c37635..c42f5c52eb 100644
--- a/stepmania/src/NoteDataWithScoring.cpp
+++ b/stepmania/src/NoteDataWithScoring.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: NoteDataWithScoring
diff --git a/stepmania/src/NoteDisplay.cpp b/stepmania/src/NoteDisplay.cpp
index b442140804..0d55623fd3 100644
--- a/stepmania/src/NoteDisplay.cpp
+++ b/stepmania/src/NoteDisplay.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: NoteDisplay
diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index 3ac27a1e7f..48ccc20d03 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: NoteField
diff --git a/stepmania/src/NoteSkinManager.cpp b/stepmania/src/NoteSkinManager.cpp
index 0150fd6b52..a1d1dd394b 100644
--- a/stepmania/src/NoteSkinManager.cpp
+++ b/stepmania/src/NoteSkinManager.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: NoteSkinManager
diff --git a/stepmania/src/NoteTypes.cpp b/stepmania/src/NoteTypes.cpp
index af80275fce..07aea678f4 100644
--- a/stepmania/src/NoteTypes.cpp
+++ b/stepmania/src/NoteTypes.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: NoteTypes.cpp
diff --git a/stepmania/src/Notes.cpp b/stepmania/src/Notes.cpp
index 9d83c52613..7b11ed2d31 100644
--- a/stepmania/src/Notes.cpp
+++ b/stepmania/src/Notes.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: Notes
diff --git a/stepmania/src/NotesLoader.cpp b/stepmania/src/NotesLoader.cpp
index 75efd9865d..88eaaa445e 100644
--- a/stepmania/src/NotesLoader.cpp
+++ b/stepmania/src/NotesLoader.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 #include "NotesLoader.h"
 #include "NoteTypes.h"
 #include "GameManager.h"
diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp
index 79717f17ea..1118664217 100644
--- a/stepmania/src/NotesLoaderBMS.cpp
+++ b/stepmania/src/NotesLoaderBMS.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 
 #include "NotesLoaderBMS.h"
 #include "NotesLoader.h"
diff --git a/stepmania/src/NotesLoaderDWI.cpp b/stepmania/src/NotesLoaderDWI.cpp
index 14f43da0b6..8b6e7f33de 100644
--- a/stepmania/src/NotesLoaderDWI.cpp
+++ b/stepmania/src/NotesLoaderDWI.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 
 #include "NotesLoaderDWI.h"
 #include "NotesLoader.h"
diff --git a/stepmania/src/NotesLoaderKSF.cpp b/stepmania/src/NotesLoaderKSF.cpp
index 347e64c3b9..b07fe4a0b8 100644
--- a/stepmania/src/NotesLoaderKSF.cpp
+++ b/stepmania/src/NotesLoaderKSF.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 
 #include "NotesLoaderKSF.h"
 
diff --git a/stepmania/src/NotesLoaderSM.cpp b/stepmania/src/NotesLoaderSM.cpp
index 004deafe74..58ff4b2923 100644
--- a/stepmania/src/NotesLoaderSM.cpp
+++ b/stepmania/src/NotesLoaderSM.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 
 #include "NotesLoaderSM.h"
 #include "GameManager.h"
diff --git a/stepmania/src/NotesWriterDWI.cpp b/stepmania/src/NotesWriterDWI.cpp
index 172c61761a..9fd93f293a 100644
--- a/stepmania/src/NotesWriterDWI.cpp
+++ b/stepmania/src/NotesWriterDWI.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 #include "NotesWriterDWI.h"
 #include "NoteTypes.h"
 #include "NoteData.h"
diff --git a/stepmania/src/NotesWriterSM.cpp b/stepmania/src/NotesWriterSM.cpp
index edadc9a2a3..ee2d9a7452 100644
--- a/stepmania/src/NotesWriterSM.cpp
+++ b/stepmania/src/NotesWriterSM.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 #include "NotesWriterSM.h"
 #include "Notes.h"
 #include "RageUtil.h"
diff --git a/stepmania/src/OptionIcon.cpp b/stepmania/src/OptionIcon.cpp
index 856e3ab13f..fed294d45b 100644
--- a/stepmania/src/OptionIcon.cpp
+++ b/stepmania/src/OptionIcon.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: OptionIcon
diff --git a/stepmania/src/OptionIconRow.cpp b/stepmania/src/OptionIconRow.cpp
index ff9a83c132..a580770640 100644
--- a/stepmania/src/OptionIconRow.cpp
+++ b/stepmania/src/OptionIconRow.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: OptionIconRow
diff --git a/stepmania/src/OptionsCursor.cpp b/stepmania/src/OptionsCursor.cpp
index 3b2c326074..fceca073ca 100644
--- a/stepmania/src/OptionsCursor.cpp
+++ b/stepmania/src/OptionsCursor.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: OptionsCursor
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index d1a745fc8c..9211f46fe6 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: Player
diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp
index 2100e29cb4..e1dc3c3aba 100644
--- a/stepmania/src/PlayerOptions.cpp
+++ b/stepmania/src/PlayerOptions.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: PlayerOptions
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index cb8c9a5eb8..a0f8fa1705 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: PrefsManager
diff --git a/stepmania/src/RageBitmapTexture.cpp b/stepmania/src/RageBitmapTexture.cpp
index 0b3cfa2eb9..4aab421d23 100644
--- a/stepmania/src/RageBitmapTexture.cpp
+++ b/stepmania/src/RageBitmapTexture.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: RageBitmapTexture
diff --git a/stepmania/src/RageDisplay.cpp b/stepmania/src/RageDisplay.cpp
index 9ea996ecd5..e574d530c5 100644
--- a/stepmania/src/RageDisplay.cpp
+++ b/stepmania/src/RageDisplay.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: RageDisplay
diff --git a/stepmania/src/RageException.cpp b/stepmania/src/RageException.cpp
index 7f47f97d0c..be86f1af4e 100644
--- a/stepmania/src/RageException.cpp
+++ b/stepmania/src/RageException.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: RageLog
diff --git a/stepmania/src/RageInput.cpp b/stepmania/src/RageInput.cpp
index 1106e14dac..f2f6a07999 100644
--- a/stepmania/src/RageInput.cpp
+++ b/stepmania/src/RageInput.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: RageInput.h
diff --git a/stepmania/src/RageInputDevice.cpp b/stepmania/src/RageInputDevice.cpp
index 65c6e8129e..aacc9b7c93 100644
--- a/stepmania/src/RageInputDevice.cpp
+++ b/stepmania/src/RageInputDevice.cpp
@@ -3,7 +3,7 @@
  * interface for describing input devices.
  */
 
-#include "stdafx.h"
+#include "global.h"
 #include "RageInputDevice.h"
 #include "RageUtil.h"
 
diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp
index 6885de9f74..a29ca270bb 100644
--- a/stepmania/src/RageLog.cpp
+++ b/stepmania/src/RageLog.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: RageLog
diff --git a/stepmania/src/RageMath.cpp b/stepmania/src/RageMath.cpp
index a830f354b9..b996dd7e8b 100644
--- a/stepmania/src/RageMath.cpp
+++ b/stepmania/src/RageMath.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: RageMath
diff --git a/stepmania/src/RageMovieTexture.cpp b/stepmania/src/RageMovieTexture.cpp
index 8e0c735496..ab5f147b12 100644
--- a/stepmania/src/RageMovieTexture.cpp
+++ b/stepmania/src/RageMovieTexture.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: RageMovieTexture
diff --git a/stepmania/src/RageMovieTextureHelper.cpp b/stepmania/src/RageMovieTextureHelper.cpp
index c893f4d730..e859959fb9 100644
--- a/stepmania/src/RageMovieTextureHelper.cpp
+++ b/stepmania/src/RageMovieTextureHelper.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 #include "RageMovieTextureHelper.h"
 #include "RageUtil.h"
 #include "RageLog.h"
diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp
index facfc15e8e..d86cb3e583 100644
--- a/stepmania/src/RageSound.cpp
+++ b/stepmania/src/RageSound.cpp
@@ -31,7 +31,7 @@
  * be passed to it with an offset of 0 (or the gap, however it works out).
  */
 
-#include "stdafx.h"
+#include "global.h"
 #include "RageSound.h"
 #include "RageSoundManager.h"
 #include "RageUtil.h"
diff --git a/stepmania/src/RageSoundManager.cpp b/stepmania/src/RageSoundManager.cpp
index 9d6308b42a..8f5c3d346f 100644
--- a/stepmania/src/RageSoundManager.cpp
+++ b/stepmania/src/RageSoundManager.cpp
@@ -1,7 +1,7 @@
 /* Handle and provide an interface to the sound driver.  Delete sounds that
  * have been detached from their owner when they're finished playing.  Distribute Update
  * calls to all sounds. */
-#include "stdafx.h"
+#include "global.h"
 
 #include "RageSoundManager.h"
 #include "RageException.h"
diff --git a/stepmania/src/RageSoundReader_SDL_Sound.cpp b/stepmania/src/RageSoundReader_SDL_Sound.cpp
index 04ce993034..7305c472fd 100644
--- a/stepmania/src/RageSoundReader_SDL_Sound.cpp
+++ b/stepmania/src/RageSoundReader_SDL_Sound.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 
 /*
  * Known problems:
diff --git a/stepmania/src/RageTexture.cpp b/stepmania/src/RageTexture.cpp
index 5768f48662..8bc632b102 100644
--- a/stepmania/src/RageTexture.cpp
+++ b/stepmania/src/RageTexture.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: RageTexture.h
diff --git a/stepmania/src/RageTextureManager.cpp b/stepmania/src/RageTextureManager.cpp
index fe719f60c9..7404873a58 100644
--- a/stepmania/src/RageTextureManager.cpp
+++ b/stepmania/src/RageTextureManager.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: RageTextureManager
diff --git a/stepmania/src/RageThreads.cpp b/stepmania/src/RageThreads.cpp
index 140881fda1..48abba1cae 100644
--- a/stepmania/src/RageThreads.cpp
+++ b/stepmania/src/RageThreads.cpp
@@ -10,7 +10,7 @@
  * SDL for the rest.)
  */
 
-#include "stdafx.h"
+#include "global.h"
 
 #include "RageThreads.h"
 #include "RageTimer.h"
diff --git a/stepmania/src/RageTimer.cpp b/stepmania/src/RageTimer.cpp
index 388c17f954..cd34cb6845 100644
--- a/stepmania/src/RageTimer.cpp
+++ b/stepmania/src/RageTimer.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: RageTimer.cpp
diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp
index dd548692ac..9600509658 100644
--- a/stepmania/src/RageUtil.cpp
+++ b/stepmania/src/RageUtil.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: RageUtil
diff --git a/stepmania/src/RandomSample.cpp b/stepmania/src/RandomSample.cpp
index f042035ffe..34bcf902a1 100644
--- a/stepmania/src/RandomSample.cpp
+++ b/stepmania/src/RandomSample.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: RandomSample.h
diff --git a/stepmania/src/SDL_dither.cpp b/stepmania/src/SDL_dither.cpp
index 15a17b9dbe..2048a52eb2 100644
--- a/stepmania/src/SDL_dither.cpp
+++ b/stepmania/src/SDL_dither.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 
 #include "SDL.h"
 #include "SDL_dither.h"
diff --git a/stepmania/src/SDL_rotozoom.cpp b/stepmania/src/SDL_rotozoom.cpp
index 057d1fcca9..f64647fa62 100644
--- a/stepmania/src/SDL_rotozoom.cpp
+++ b/stepmania/src/SDL_rotozoom.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*  
  * SDL_rotozoom.c - rotozoomer for 32bit or 8bit surfaces
  *
diff --git a/stepmania/src/SDL_utils.cpp b/stepmania/src/SDL_utils.cpp
index 4cedf7bcc4..d3c133bdee 100644
--- a/stepmania/src/SDL_utils.cpp
+++ b/stepmania/src/SDL_utils.cpp
@@ -7,7 +7,7 @@
  * Portions from SDL source and documentation.
  */
 
-#include "stdafx.h"
+#include "global.h"
 
 #include "SDL.h"
 #include "SDL_utils.h"
diff --git a/stepmania/src/Sample3dObject.cpp b/stepmania/src/Sample3dObject.cpp
index 2d40216fda..b96d91e999 100644
--- a/stepmania/src/Sample3dObject.cpp
+++ b/stepmania/src/Sample3dObject.cpp
@@ -5,7 +5,7 @@
  * should be positioned just like any other actor, calling SetX and SetY
  * in the parent; that position will become the center of the frustum.
  */
-#include "stdafx.h"
+#include "global.h"
 
 #include "Sample3dObject.h"
 
diff --git a/stepmania/src/ScoreDisplay.cpp b/stepmania/src/ScoreDisplay.cpp
index 8059fd4677..9b7b84901a 100644
--- a/stepmania/src/ScoreDisplay.cpp
+++ b/stepmania/src/ScoreDisplay.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScoreDisplay.h
diff --git a/stepmania/src/ScoreDisplayNormal.cpp b/stepmania/src/ScoreDisplayNormal.cpp
index af990a1d01..7bab321b02 100644
--- a/stepmania/src/ScoreDisplayNormal.cpp
+++ b/stepmania/src/ScoreDisplayNormal.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScoreDisplayNormal.h
diff --git a/stepmania/src/ScoreDisplayOni.cpp b/stepmania/src/ScoreDisplayOni.cpp
index bc74d26f91..1864fabcff 100644
--- a/stepmania/src/ScoreDisplayOni.cpp
+++ b/stepmania/src/ScoreDisplayOni.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScoreDisplayOni
diff --git a/stepmania/src/ScoreDisplayRolling.cpp b/stepmania/src/ScoreDisplayRolling.cpp
index 956e22b3f4..8cd3c09ef1 100644
--- a/stepmania/src/ScoreDisplayRolling.cpp
+++ b/stepmania/src/ScoreDisplayRolling.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: ScoreDisplayRolling.h
diff --git a/stepmania/src/ScoreKeeper.cpp b/stepmania/src/ScoreKeeper.cpp
index cb6995db35..c66ac97fbb 100644
--- a/stepmania/src/ScoreKeeper.cpp
+++ b/stepmania/src/ScoreKeeper.cpp
@@ -1,3 +1,3 @@
-#include "stdafx.h"
+#include "global.h"
 #include "ScoreKeeper.h"
 
diff --git a/stepmania/src/ScoreKeeperMAX2.cpp b/stepmania/src/ScoreKeeperMAX2.cpp
index 93ab2be50f..e96aa2ecc3 100644
--- a/stepmania/src/ScoreKeeperMAX2.cpp
+++ b/stepmania/src/ScoreKeeperMAX2.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 #include "ScoreKeeperMAX2.h"
 #include "GameState.h"
 
diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp
index 4b240dfa3c..3ed2a47b55 100644
--- a/stepmania/src/Screen.cpp
+++ b/stepmania/src/Screen.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: Screen
diff --git a/stepmania/src/ScreenAlbums.cpp b/stepmania/src/ScreenAlbums.cpp
index 7a2e1d89df..d17de72044 100644
--- a/stepmania/src/ScreenAlbums.cpp
+++ b/stepmania/src/ScreenAlbums.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenAlbums
diff --git a/stepmania/src/ScreenAppearanceOptions.cpp b/stepmania/src/ScreenAppearanceOptions.cpp
index 9157ec7f37..011b48d111 100644
--- a/stepmania/src/ScreenAppearanceOptions.cpp
+++ b/stepmania/src/ScreenAppearanceOptions.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenAppearanceOptions
diff --git a/stepmania/src/ScreenAttract.cpp b/stepmania/src/ScreenAttract.cpp
index 5484c750fc..da62447a8b 100644
--- a/stepmania/src/ScreenAttract.cpp
+++ b/stepmania/src/ScreenAttract.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenAttract
diff --git a/stepmania/src/ScreenCaution.cpp b/stepmania/src/ScreenCaution.cpp
index 7a501b539b..8900a59abf 100644
--- a/stepmania/src/ScreenCaution.cpp
+++ b/stepmania/src/ScreenCaution.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenCaution
diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp
index 7c271fbae8..00b5347a5e 100644
--- a/stepmania/src/ScreenDemonstration.cpp
+++ b/stepmania/src/ScreenDemonstration.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenDemonstration
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 1227edf0d2..2d56da68e2 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenEdit
diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp
index 3ad77bd825..e84340b877 100644
--- a/stepmania/src/ScreenEditMenu.cpp
+++ b/stepmania/src/ScreenEditMenu.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenEditMenu
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 0188d02ae1..a1cb458676 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenEvaluation
diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp
index d2f7fffe38..7d3c034d16 100644
--- a/stepmania/src/ScreenEz2SelectMusic.cpp
+++ b/stepmania/src/ScreenEz2SelectMusic.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: ScreenEz2SelectMusic.cpp
@@ -11,7 +11,7 @@
 -----------------------------------------------------------------------------
 */
 
-#include "stdafx.h"
+#include "global.h"
 
 #include "ScreenEz2SelectMusic.h"
 
diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp
index 444ab8ec7b..6980e2c5f0 100644
--- a/stepmania/src/ScreenEz2SelectPlayer.cpp
+++ b/stepmania/src/ScreenEz2SelectPlayer.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /****************************************
 ScreenEzSelectPlayer,cpp
 Desc: See Header
diff --git a/stepmania/src/ScreenEz2SelectStyle.cpp b/stepmania/src/ScreenEz2SelectStyle.cpp
index dd3c03b68c..3be1166df1 100644
--- a/stepmania/src/ScreenEz2SelectStyle.cpp
+++ b/stepmania/src/ScreenEz2SelectStyle.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /****************************************
 ScreenEzSelectPlayer,cpp
 Desc: See Header
diff --git a/stepmania/src/ScreenGameOver.cpp b/stepmania/src/ScreenGameOver.cpp
index 2fa22640ae..c541ffe650 100644
--- a/stepmania/src/ScreenGameOver.cpp
+++ b/stepmania/src/ScreenGameOver.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenGameOver
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index d11c9ea9a3..77ee4125e7 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenGameplay
diff --git a/stepmania/src/ScreenGameplayOptions.cpp b/stepmania/src/ScreenGameplayOptions.cpp
index fbeea54130..7408df36f8 100644
--- a/stepmania/src/ScreenGameplayOptions.cpp
+++ b/stepmania/src/ScreenGameplayOptions.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenGameplayOptions
diff --git a/stepmania/src/ScreenGraphicOptions.cpp b/stepmania/src/ScreenGraphicOptions.cpp
index ac828ec77c..398a0640d9 100644
--- a/stepmania/src/ScreenGraphicOptions.cpp
+++ b/stepmania/src/ScreenGraphicOptions.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenGraphicOptions
diff --git a/stepmania/src/ScreenInputOptions.cpp b/stepmania/src/ScreenInputOptions.cpp
index a47794a136..33ce40b333 100644
--- a/stepmania/src/ScreenInputOptions.cpp
+++ b/stepmania/src/ScreenInputOptions.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenInputOptions
diff --git a/stepmania/src/ScreenInstructions.cpp b/stepmania/src/ScreenInstructions.cpp
index d02fb2f14e..e0763eadca 100644
--- a/stepmania/src/ScreenInstructions.cpp
+++ b/stepmania/src/ScreenInstructions.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenInstructions
diff --git a/stepmania/src/ScreenIntroMovie.cpp b/stepmania/src/ScreenIntroMovie.cpp
index e99a1647cf..86207944ec 100644
--- a/stepmania/src/ScreenIntroMovie.cpp
+++ b/stepmania/src/ScreenIntroMovie.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 #include "ScreenIntroMovie.h"
 
 void ScreenIntroMovie::Update( float fDelta )
diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp
index 606b1d5f29..1415218e53 100644
--- a/stepmania/src/ScreenJukebox.cpp
+++ b/stepmania/src/ScreenJukebox.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenJukebox
diff --git a/stepmania/src/ScreenJukeboxMenu.cpp b/stepmania/src/ScreenJukeboxMenu.cpp
index e897c2805b..1ceb49d6a3 100644
--- a/stepmania/src/ScreenJukeboxMenu.cpp
+++ b/stepmania/src/ScreenJukeboxMenu.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenJukeboxMenu
diff --git a/stepmania/src/ScreenLogo.cpp b/stepmania/src/ScreenLogo.cpp
index f0e2a0245d..7f75fa5516 100644
--- a/stepmania/src/ScreenLogo.cpp
+++ b/stepmania/src/ScreenLogo.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenLogo
diff --git a/stepmania/src/ScreenMachineOptions.cpp b/stepmania/src/ScreenMachineOptions.cpp
index 7201c1891e..8143d0ba74 100644
--- a/stepmania/src/ScreenMachineOptions.cpp
+++ b/stepmania/src/ScreenMachineOptions.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenMachineOptions
diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index 7e7b3215e7..5f85df7cc7 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenManager
diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index 6725498042..e4e777f013 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenMapControllers
diff --git a/stepmania/src/ScreenMusicScroll.cpp b/stepmania/src/ScreenMusicScroll.cpp
index c067312d35..e93ccf2d9e 100644
--- a/stepmania/src/ScreenMusicScroll.cpp
+++ b/stepmania/src/ScreenMusicScroll.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenMusicScroll
diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index f440bcd9ca..acd9e4f4b1 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenNameEntry
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index ba98f54e38..2b7400e0d7 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenOptions
diff --git a/stepmania/src/ScreenOptionsMenu.cpp b/stepmania/src/ScreenOptionsMenu.cpp
index 567eb793ab..ffd9be44e6 100644
--- a/stepmania/src/ScreenOptionsMenu.cpp
+++ b/stepmania/src/ScreenOptionsMenu.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenOptionsMenu
diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index 7bb66aa608..50a9e42289 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenPlayerOptions
diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp
index aa43d6504f..09522a9cb7 100644
--- a/stepmania/src/ScreenPrompt.cpp
+++ b/stepmania/src/ScreenPrompt.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenPrompt
diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index 4b5d7b9336..458ff32c03 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenRanking
diff --git a/stepmania/src/ScreenSandbox.cpp b/stepmania/src/ScreenSandbox.cpp
index 0834e22a61..e9571c297d 100644
--- a/stepmania/src/ScreenSandbox.cpp
+++ b/stepmania/src/ScreenSandbox.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: ScreenSandbox.h
@@ -15,7 +15,7 @@
 -----------------------------------------------------------------------------
 */
 
-#include "stdafx.h"
+#include "global.h"
 #include "ScreenSandbox.h"
 
 
diff --git a/stepmania/src/ScreenSelectCourse.cpp b/stepmania/src/ScreenSelectCourse.cpp
index 6bf49349fa..2bfe4f514a 100644
--- a/stepmania/src/ScreenSelectCourse.cpp
+++ b/stepmania/src/ScreenSelectCourse.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenSelectCourse
diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp
index 07f2e15cb6..f259afbfe5 100644
--- a/stepmania/src/ScreenSelectDifficulty.cpp
+++ b/stepmania/src/ScreenSelectDifficulty.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenSelectDifficulty
diff --git a/stepmania/src/ScreenSelectGame.cpp b/stepmania/src/ScreenSelectGame.cpp
index 039638a963..ccfe1342f5 100644
--- a/stepmania/src/ScreenSelectGame.cpp
+++ b/stepmania/src/ScreenSelectGame.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: ScreenSelectGame.cpp
diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp
index e2d2a39d38..3f801f06ef 100644
--- a/stepmania/src/ScreenSelectGroup.cpp
+++ b/stepmania/src/ScreenSelectGroup.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenSelectGroup
diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp
index ff91bc918f..c7b5284d82 100644
--- a/stepmania/src/ScreenSelectMode.cpp
+++ b/stepmania/src/ScreenSelectMode.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /****************************************
 ScreenEzSelectPlayer,cpp
 Desc: See Header
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 3553101710..ae99d34125 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenSelectMusic
diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp
index e2f528f0b5..39fd062b26 100644
--- a/stepmania/src/ScreenSelectStyle.cpp
+++ b/stepmania/src/ScreenSelectStyle.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenSelectStyle
diff --git a/stepmania/src/ScreenSelectStyle5th.cpp b/stepmania/src/ScreenSelectStyle5th.cpp
index 5aa55d48af..1bcd9057c4 100644
--- a/stepmania/src/ScreenSelectStyle5th.cpp
+++ b/stepmania/src/ScreenSelectStyle5th.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenSelectStyle5th
diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp
index 20d5db50d5..e626e86b43 100644
--- a/stepmania/src/ScreenSongOptions.cpp
+++ b/stepmania/src/ScreenSongOptions.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenSongOptions
diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp
index e72ee9f3a0..da61d54b10 100644
--- a/stepmania/src/ScreenStage.cpp
+++ b/stepmania/src/ScreenStage.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenStage
diff --git a/stepmania/src/ScreenStyleSplash.cpp b/stepmania/src/ScreenStyleSplash.cpp
index ceb366f461..10927ef9f1 100644
--- a/stepmania/src/ScreenStyleSplash.cpp
+++ b/stepmania/src/ScreenStyleSplash.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenCaution
diff --git a/stepmania/src/ScreenTest.cpp b/stepmania/src/ScreenTest.cpp
index 248b4087e1..63850e3466 100644
--- a/stepmania/src/ScreenTest.cpp
+++ b/stepmania/src/ScreenTest.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: ScreenTest.h
@@ -12,7 +12,7 @@
 -----------------------------------------------------------------------------
 */
 
-#include "stdafx.h"
+#include "global.h"
 #include "ScreenTest.h"
 #include "ScreenSandbox.h"
 #include "ScreenTestSound.h"
diff --git a/stepmania/src/ScreenTestFonts.cpp b/stepmania/src/ScreenTestFonts.cpp
index 639fdb5324..cc06a25dc5 100644
--- a/stepmania/src/ScreenTestFonts.cpp
+++ b/stepmania/src/ScreenTestFonts.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 
 #include "ScreenTestFonts.h"
 #include "FontManager.h"
diff --git a/stepmania/src/ScreenTestSound.cpp b/stepmania/src/ScreenTestSound.cpp
index 84c79b4e54..19a054ad67 100644
--- a/stepmania/src/ScreenTestSound.cpp
+++ b/stepmania/src/ScreenTestSound.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: ScreenTestSound.h
@@ -12,7 +12,7 @@
 -----------------------------------------------------------------------------
 */
 
-#include "stdafx.h"
+#include "global.h"
 
 #include "ScreenTestSound.h"
 #include "RageDisplay.h"
diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp
index 543d75039b..aaaa5edaeb 100644
--- a/stepmania/src/ScreenTextEntry.cpp
+++ b/stepmania/src/ScreenTextEntry.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenTextEntry
diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp
index 148e3fce60..e0b0661d59 100644
--- a/stepmania/src/ScreenTitleMenu.cpp
+++ b/stepmania/src/ScreenTitleMenu.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScreenTitleMenu
diff --git a/stepmania/src/ScrollBar.cpp b/stepmania/src/ScrollBar.cpp
index f26310586b..cbd7ec01df 100644
--- a/stepmania/src/ScrollBar.cpp
+++ b/stepmania/src/ScrollBar.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScrollBar
diff --git a/stepmania/src/ScrollingList.cpp b/stepmania/src/ScrollingList.cpp
index 83256cef7b..d44e7d8b1d 100644
--- a/stepmania/src/ScrollingList.cpp
+++ b/stepmania/src/ScrollingList.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: ScrollingList
diff --git a/stepmania/src/SmallGradeDisplay.cpp b/stepmania/src/SmallGradeDisplay.cpp
index 419d305479..faf695094a 100644
--- a/stepmania/src/SmallGradeDisplay.cpp
+++ b/stepmania/src/SmallGradeDisplay.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: SmallGradeDisplay
diff --git a/stepmania/src/SnapDisplay.cpp b/stepmania/src/SnapDisplay.cpp
index e7e660f630..05eb25a699 100644
--- a/stepmania/src/SnapDisplay.cpp
+++ b/stepmania/src/SnapDisplay.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: SnapDisplay
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 2a03c3cb17..6c2ec5a21a 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: Song
diff --git a/stepmania/src/SongCacheIndex.cpp b/stepmania/src/SongCacheIndex.cpp
index 1caf7259c2..a5e68ffa45 100644
--- a/stepmania/src/SongCacheIndex.cpp
+++ b/stepmania/src/SongCacheIndex.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index 4a8c7077ad..0aba2f1833 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: SongManager
diff --git a/stepmania/src/SongOptions.cpp b/stepmania/src/SongOptions.cpp
index 754d7e0a2e..6d4c77487c 100644
--- a/stepmania/src/SongOptions.cpp
+++ b/stepmania/src/SongOptions.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: SongOptions
diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp
index 2a3d5ec116..76cdd9f882 100644
--- a/stepmania/src/Sprite.cpp
+++ b/stepmania/src/Sprite.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: Sprite
diff --git a/stepmania/src/StageDisplay.cpp b/stepmania/src/StageDisplay.cpp
index 4a35d661b6..56b420d0a6 100644
--- a/stepmania/src/StageDisplay.cpp
+++ b/stepmania/src/StageDisplay.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: StageDisplay
diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp
index b63ffe43a8..4f88024748 100644
--- a/stepmania/src/StageStats.cpp
+++ b/stepmania/src/StageStats.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: StageStats
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 2d2ffe5a8d..8479866bcf 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: StepMania.cpp
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index 95117117a4..b771b7eab2 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -78,7 +78,7 @@ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "DEBUG" /Fr /YX"stdafx.h" /FD /c
+# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "DEBUG" /Fr /YX"global.h" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -799,20 +799,20 @@ SOURCE=.\ScreenDimensions.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\StdAfx.cpp
+SOURCE=.\globla.cpp
 
 !IF  "$(CFG)" == "StepMania - Win32 Release"
 
 !ELSEIF  "$(CFG)" == "StepMania - Win32 Debug"
 
-# ADD CPP /Yc"stdafx.h"
+# ADD CPP /Yc"global.h"
 
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=.\StdAfx.h
+SOURCE=.\global.h
 # End Source File
 # Begin Source File
 
@@ -1478,7 +1478,7 @@ SOURCE=.\ScreenEditMenu.cpp
 
 !ELSEIF  "$(CFG)" == "StepMania - Win32 Debug"
 
-# ADD CPP /YX"stdafx.h"
+# ADD CPP /YX"global.h"
 
 !ENDIF 
 
diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj
index 83ab7578fd..0b9c17a80a 100644
--- a/stepmania/src/StepMania.vcproj
+++ b/stepmania/src/StepMania.vcproj
@@ -688,10 +688,10 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			Name="StepMania"
 			Filter="">
 			<File
-				RelativePath=".\StdAfx.cpp">
+				RelativePath=".\global.cpp">
 			</File>
 			<File
-				RelativePath=".\StdAfx.h">
+				RelativePath=".\global.h">
 			</File>
 			<File
 				RelativePath="StdString.h">
diff --git a/stepmania/src/StyleDef.cpp b/stepmania/src/StyleDef.cpp
index b323a34a95..af5fd3bd39 100644
--- a/stepmania/src/StyleDef.cpp
+++ b/stepmania/src/StyleDef.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: StyleDef
diff --git a/stepmania/src/TextBanner.cpp b/stepmania/src/TextBanner.cpp
index ef26bca7d8..1a4cca0aab 100644
--- a/stepmania/src/TextBanner.cpp
+++ b/stepmania/src/TextBanner.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: TextBanner
diff --git a/stepmania/src/TipDisplay.cpp b/stepmania/src/TipDisplay.cpp
index 3ae06651c7..aa4b543f85 100644
--- a/stepmania/src/TipDisplay.cpp
+++ b/stepmania/src/TipDisplay.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: TipDisplay
diff --git a/stepmania/src/TitleSubstitution.cpp b/stepmania/src/TitleSubstitution.cpp
index a2dd62c2d6..7c1e86a155 100644
--- a/stepmania/src/TitleSubstitution.cpp
+++ b/stepmania/src/TitleSubstitution.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 #include "TitleSubstitution.h"
 
 #include "RageUtil.h"
diff --git a/stepmania/src/Transition.cpp b/stepmania/src/Transition.cpp
index 407d4a9b7d..0fa087139a 100644
--- a/stepmania/src/Transition.cpp
+++ b/stepmania/src/Transition.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: Transition.cpp
diff --git a/stepmania/src/TransitionBackWipe.cpp b/stepmania/src/TransitionBackWipe.cpp
index 6b308d1944..3397b32e13 100644
--- a/stepmania/src/TransitionBackWipe.cpp
+++ b/stepmania/src/TransitionBackWipe.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: TransitionBackWipe
diff --git a/stepmania/src/TransitionFade.cpp b/stepmania/src/TransitionFade.cpp
index 285663624a..7c3f58c9af 100644
--- a/stepmania/src/TransitionFade.cpp
+++ b/stepmania/src/TransitionFade.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: TransitionFade
diff --git a/stepmania/src/TransitionFadeWipe.cpp b/stepmania/src/TransitionFadeWipe.cpp
index 93a9ffec4f..13185bef19 100644
--- a/stepmania/src/TransitionFadeWipe.cpp
+++ b/stepmania/src/TransitionFadeWipe.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: TransitionStarWipe.cpp
diff --git a/stepmania/src/TransitionInvisible.cpp b/stepmania/src/TransitionInvisible.cpp
index e4a3237726..5ca3ece373 100644
--- a/stepmania/src/TransitionInvisible.cpp
+++ b/stepmania/src/TransitionInvisible.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: TransitionInvisible
diff --git a/stepmania/src/TransitionKeepAlive.cpp b/stepmania/src/TransitionKeepAlive.cpp
index 4d9c869d08..22880d7074 100644
--- a/stepmania/src/TransitionKeepAlive.cpp
+++ b/stepmania/src/TransitionKeepAlive.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: TransitionKeepAlive
diff --git a/stepmania/src/TransitionOniFade.cpp b/stepmania/src/TransitionOniFade.cpp
index 2e44015f7a..2684b2f254 100644
--- a/stepmania/src/TransitionOniFade.cpp
+++ b/stepmania/src/TransitionOniFade.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  Class: TransitionOniFade
diff --git a/stepmania/src/TransitionRectWipe.cpp b/stepmania/src/TransitionRectWipe.cpp
index 6f54d39d71..6a11b416e0 100644
--- a/stepmania/src/TransitionRectWipe.cpp
+++ b/stepmania/src/TransitionRectWipe.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: TransitionStarWipe.cpp
diff --git a/stepmania/src/TransitionStarWipe.cpp b/stepmania/src/TransitionStarWipe.cpp
index 513ab8a178..1f70c63cb7 100644
--- a/stepmania/src/TransitionStarWipe.cpp
+++ b/stepmania/src/TransitionStarWipe.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "global.h"
 /*
 -----------------------------------------------------------------------------
  File: TransitionStarWipe.cpp