diff --git a/src/RageUtil.cpp b/src/RageUtil.cpp
index 8667659a24..cd5dbac30e 100644
--- a/src/RageUtil.cpp
+++ b/src/RageUtil.cpp
@@ -16,6 +16,7 @@
 #include <ctime>
 #include <sstream>
 #include <map>
+#include <functional>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <math.h>
diff --git a/src/StdString.h b/src/StdString.h
index 17f7946dc9..5507d6c6fb 100644
--- a/src/StdString.h
+++ b/src/StdString.h
@@ -91,8 +91,7 @@ typedef char*			PSTR;
 
 // Standard headers needed
 #include <string>			// basic_string
-#include <algorithm>		// for_each, etc.
-#include <functional>		// for StdStringLessNoCase, et al
+#include <algorithm>			// for_each, etc.
 
 #if defined(WIN32)
 #include <malloc.h>			// _alloca
@@ -799,25 +798,23 @@ typedef CStdStr<char>		CStdStringA;	// a better std::string
 // -----------------------------------------------------------------------------
 // FUNCTIONAL COMPARATORS:
 // REMARKS:
-//		These structs are derived from the std::binary_function template.  They
-//		give us functional classes (which may be used in Standard C++ Library
-//		collections and algorithms) that perform case-insensitive comparisons of
-//		CStdString objects.  This is useful for maps in which the key may be the
-//		 proper string but in the wrong case.
+//		These structs give us functional classes (which may be used in
+//		Standard C++ Library collections and algorithms) that perform
+//		case-insensitive comparisons of CStdString objects.  This is
+//		useful for maps in which the key may be the proper string but
+//		in the wrong case.
 // -----------------------------------------------------------------------------
 
 #define StdStringLessNoCase		SSLNCA
 #define StdStringEqualsNoCase		SSENCA
 
 struct StdStringLessNoCase
-	: std::binary_function<CStdStringA, CStdStringA, bool>
 {
 	inline
 	bool operator()(const CStdStringA& sLeft, const CStdStringA& sRight) const
 	{ return ssicmp(sLeft.c_str(), sRight.c_str()) < 0; }
 };
 struct StdStringEqualsNoCase
-	: std::binary_function<CStdStringA, CStdStringA, bool>
 {
 	inline
 	bool operator()(const CStdStringA& sLeft, const CStdStringA& sRight) const
diff --git a/src/TimingData.cpp b/src/TimingData.cpp
index 4a725868d6..46b26d0ec1 100644
--- a/src/TimingData.cpp
+++ b/src/TimingData.cpp
@@ -420,7 +420,7 @@ int TimingData::GetSegmentIndexAtRow(TimingSegmentType tst, int iRow ) const
 	return INVALID_INDEX;
 }
 
-struct ts_less : binary_function <TimingSegment*, TimingSegment*, bool>
+struct ts_less
 {
 	bool operator() (const TimingSegment *x, const TimingSegment *y) const
 	{