diff --git a/Xcode/stepmania_xcode4.3.xcodeproj/project.pbxproj b/Xcode/stepmania_xcode4.3.xcodeproj/project.pbxproj
index 6ccb0df354..8cb7d6311a 100644
--- a/Xcode/stepmania_xcode4.3.xcodeproj/project.pbxproj
+++ b/Xcode/stepmania_xcode4.3.xcodeproj/project.pbxproj
@@ -8317,6 +8317,7 @@
 			baseConfigurationReference = AA8B8C49091F48C000D14C5F /* product.xcconfig */;
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+				CLANG_CXX_LIBRARY = "libc++";
 				COMBINE_HIDPI_IMAGES = YES;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
 				FULL_NAME = "$(PRODUCT_NAME).$(WRAPPER_EXTENSION)";
@@ -8819,6 +8820,7 @@
 			baseConfigurationReference = AA8B8C49091F48C000D14C5F /* product.xcconfig */;
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+				CLANG_CXX_LIBRARY = "libc++";
 				COMBINE_HIDPI_IMAGES = YES;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
 				COPY_PHASE_STRIP = NO;
@@ -9075,6 +9077,7 @@
 			baseConfigurationReference = AA8B8C49091F48C000D14C5F /* product.xcconfig */;
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+				CLANG_CXX_LIBRARY = "libc++";
 				COMBINE_HIDPI_IMAGES = YES;
 				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
 				FULL_NAME = "$(PRODUCT_NAME).$(WRAPPER_EXTENSION)";
diff --git a/src/Attack.cpp b/src/Attack.cpp
index f3e487887c..aac249481a 100644
--- a/src/Attack.cpp
+++ b/src/Attack.cpp
@@ -90,16 +90,7 @@ int Attack::GetNumAttacks() const
 
 bool AttackArray::ContainsTransformOrTurn() const
 {
-#ifdef MACOSX
-	for (Attack const &a : *this)
-	{
-		if( a.ContainsTransformOrTurn() )
-			return true;
-	}
-	return false;
-#else
 	return std::any_of((*this).begin(), (*this).end(), [](Attack const &a) { return a.ContainsTransformOrTurn(); });
-#endif
 }
 
 vector<RString> AttackArray::ToVectorString() const
diff --git a/src/Command.cpp b/src/Command.cpp
index 3a5df0c9e9..6d60a7747f 100644
--- a/src/Command.cpp
+++ b/src/Command.cpp
@@ -81,14 +81,7 @@ static void SplitWithQuotes( const RString sSource, const char Delimitor, vector
 
 RString Commands::GetOriginalCommandString() const
 {
-#ifdef MACOSX
-	RString s;
-	for (Command const &c : v)
-		s += c.GetOriginalCommandString();
-	return s;
-#else
 	return std::accumulate(v.begin(), v.end(), RString(), [](RString &res, Command const &c) { return res += c.GetOriginalCommandString(); });
-#endif
 }
 
 void ParseCommands( const RString &sCommands, Commands &vCommandsOut )
diff --git a/src/Course.cpp b/src/Course.cpp
index 51ad58cd47..4403b47401 100644
--- a/src/Course.cpp
+++ b/src/Course.cpp
@@ -697,17 +697,7 @@ int Course::GetMeter( StepsType st, CourseDifficulty cd ) const
 
 bool Course::HasMods() const
 {
-#ifdef MACOSX
-	for (CourseEntry const &e : m_vEntries)
-	{
-		if( !e.attacks.empty() )
-			return true;
-	}
-
-	return false;
-#else
 	return std::any_of(m_vEntries.begin(), m_vEntries.end(), [](CourseEntry const &e) { return !e.attacks.empty(); });
-#endif
 }
 
 bool Course::HasTimedMods() const
@@ -722,34 +712,17 @@ bool Course::HasTimedMods() const
 		{
 			continue;
 		}
-#ifdef MACOSX
-		for (Attack const &attack : e.attacks)
-		{
-			if(!attack.bGlobal)
-				return true;
-		}
-#else
 		if (std::any_of(e.attacks.begin(), e.attacks.end(), [](Attack const &a) { return !a.bGlobal; }))
 		{
 			return true;
 		}
-#endif
 	}
 	return false;
 }
 
 bool Course::AllSongsAreFixed() const
 {
-#ifdef MACOSX
-	for (CourseEntry const &e : m_vEntries)
-	{
-		if( !e.IsFixedSong() )
-			return false;
-	}
-	return true;
-#else
 	return std::all_of(m_vEntries.begin(), m_vEntries.end(), [](CourseEntry const &e) { return e.IsFixedSong(); });
-#endif
 }
 
 const Style *Course::GetCourseStyle( const Game *pGame, int iNumPlayers ) const
diff --git a/src/CourseUtil.cpp b/src/CourseUtil.cpp
index c85ea4de3b..09b3d99909 100644
--- a/src/CourseUtil.cpp
+++ b/src/CourseUtil.cpp
@@ -493,21 +493,7 @@ void EditCourseUtil::LoadDefaults( Course &out )
 		vector<Course*> vpCourses;
 		EditCourseUtil::GetAllEditCourses( vpCourses );
 
-#ifdef MACOSX
-		bool bNameInUse = false;
-		for (Course const *p : vpCourses)
-		{
-			if( out.m_sMainTitle == p->m_sMainTitle )
-			{
-				bNameInUse = true;
-				break;
-			}
-		}
-
-		if( !bNameInUse )
-#else
 		if (std::any_of(vpCourses.begin(), vpCourses.end(), [&](Course const *p) { return out.m_sMainTitle == p->m_sMainTitle; }))
-#endif
 			break;
 	}
 
diff --git a/src/GameConstantsAndTypes.cpp b/src/GameConstantsAndTypes.cpp
index 11a4349461..7f5a84460c 100644
--- a/src/GameConstantsAndTypes.cpp
+++ b/src/GameConstantsAndTypes.cpp
@@ -388,16 +388,7 @@ bool DisplayBpms::BpmIsConstant() const
 
 bool DisplayBpms::IsSecret() const
 {
-#ifdef MACOSX
-	for (float const &f : vfBpms)
-	{
-		if( f == -1 )
-			return true;
-	}
-	return false;
-#else
 	return std::any_of(vfBpms.begin(), vfBpms.end(), [](float const &f) { return f == -1; });
-#endif
 }
 
 static const char *StyleTypeNames[] = {
diff --git a/src/Model.cpp b/src/Model.cpp
index 4232b20f0c..de3e97b1fc 100644
--- a/src/Model.cpp
+++ b/src/Model.cpp
@@ -760,16 +760,7 @@ void Model::SetSecondsIntoAnimation( float fSeconds )
 
 bool Model::MaterialsNeedNormals() const
 {
-#ifdef MACOSX
-	for (msMaterial const &m : m_Materials)
-	{
-		if( m.NeedsNormals() )
-			return true;
-	}
-	return false;
-#else
 	return std::any_of(m_Materials.begin(), m_Materials.end(), [](msMaterial const &m) { return m.NeedsNormals(); });
-#endif
 }
 
 // lua start
diff --git a/src/PlayerStageStats.cpp b/src/PlayerStageStats.cpp
index 51786832a6..f0637a6bce 100644
--- a/src/PlayerStageStats.cpp
+++ b/src/PlayerStageStats.cpp
@@ -314,15 +314,8 @@ int PlayerStageStats::GetLessonScoreActual() const
 
 int PlayerStageStats::GetLessonScoreNeeded() const
 {
-#ifdef MACOSX
-	float score = 0;
-
-	for (Steps const *steps : m_vpPossibleSteps)
-		score += steps->GetRadarValues( PLAYER_1 ).m_Values.v.fNumTapsAndHolds;
-#else
-	float score = std::accumulate(m_vpPossibleSteps.begin(), m_vpPossibleSteps.end(), 0.f, 
+	float score = std::accumulate(m_vpPossibleSteps.begin(), m_vpPossibleSteps.end(), 0.f,
 		[](float total, Steps const *steps) { return total += steps->GetRadarValues(PLAYER_1).m_Values.v.fNumTapsAndHolds; });
-#endif
 	return lrintf( score * LESSON_PASS_THRESHOLD );
 }
 
diff --git a/src/Song.cpp b/src/Song.cpp
index 5ccd4eb557..3a8fa01c9f 100644
--- a/src/Song.cpp
+++ b/src/Song.cpp
@@ -1203,21 +1203,8 @@ bool Song::IsTutorial() const
 
 bool Song::HasEdits( StepsType st ) const
 {
-#ifdef MACOSX
-	for (Steps const *pSteps : m_vpSteps)
-	{
-		if( pSteps->m_StepsType == st &&
-			pSteps->GetDifficulty() == Difficulty_Edit )
-		{
-			return true;
-		}
-	}
-
-	return false;
-#else
 	return std::any_of(m_vpSteps.begin(), m_vpSteps.end(),
 		[&](Steps const *step) { return step->m_StepsType == st && step->GetDifficulty() == Difficulty_Edit; });
-#endif
 }
 
 bool Song::NormallyDisplayed() const
diff --git a/src/StatsManager.cpp b/src/StatsManager.cpp
index cc0b7a3bde..fa0d710c5a 100644
--- a/src/StatsManager.cpp
+++ b/src/StatsManager.cpp
@@ -410,22 +410,8 @@ public:
 		FOREACH_HumanPlayer( p )
 		{
 			// If this player failed any stage, then their final grade is an F.
-#ifdef MACOSX
-			bool bPlayerFailedOneStage = false;
-			for (StageStats const &ss : STATSMAN->m_vPlayedStageStats)
-			{
-				if( ss.m_player[p].m_bFailed )
-				{
-					bPlayerFailedOneStage = true;
-					break;
-				}
-			}
-
-			if( bPlayerFailedOneStage )
-#else
 			if (std::any_of(STATSMAN->m_vPlayedStageStats.begin(), STATSMAN->m_vPlayedStageStats.end(),
 				[&](StageStats const &ss) { return ss.m_player[p].m_bFailed; }))
-#endif
 				continue;
 
 			top_grade = min( top_grade, stats.m_player[p].GetGrade() );
diff --git a/src/TrailUtil.cpp b/src/TrailUtil.cpp
index 3007570ac3..a7b741ed62 100644
--- a/src/TrailUtil.cpp
+++ b/src/TrailUtil.cpp
@@ -14,15 +14,8 @@ int TrailUtil::GetNumSongs( const Trail *pTrail )
 
 float TrailUtil::GetTotalSeconds( const Trail *pTrail )
 {
-#ifdef MACOSX
-	float fSecs = 0;
-	for (TrailEntry const &e : pTrail->m_vEntries)
-		fSecs += e.pSong->m_fMusicLengthSeconds;
-	return fSecs;
-#else
 	auto const &entries = pTrail->m_vEntries;
 	return std::accumulate(entries.begin(), entries.end(), 0.f, [](float total, TrailEntry const &e) { return total += e.pSong->m_fMusicLengthSeconds; });
-#endif
 }
 
 ///////////////////////////////////////////////////////////////////////