diff --git a/Source/Core/AudioCommon/Src/AOSoundStream.cpp b/Source/Core/AudioCommon/Src/AOSoundStream.cpp
index 276938c3e2..99ae2e661c 100644
--- a/Source/Core/AudioCommon/Src/AOSoundStream.cpp
+++ b/Source/Core/AudioCommon/Src/AOSoundStream.cpp
@@ -63,7 +63,7 @@ bool AOSound::Start()
 {
 	memset(realtimeBuffer, 0, sizeof(realtimeBuffer));
 	
-	thread = std::thread(std::mem_fn(&AOSound::SoundLoop), this);
+	thread = std::thread(std::mem_fun(&AOSound::SoundLoop), this);
 	return true;
 }
 
diff --git a/Source/Core/AudioCommon/Src/DSoundStream.cpp b/Source/Core/AudioCommon/Src/DSoundStream.cpp
index c0c54e00f5..b252dc90c5 100644
--- a/Source/Core/AudioCommon/Src/DSoundStream.cpp
+++ b/Source/Core/AudioCommon/Src/DSoundStream.cpp
@@ -135,7 +135,7 @@ bool DSound::Start()
 	dsBuffer->Lock(0, bufferSize, (void* *)&p1, &num1, 0, 0, DSBLOCK_ENTIREBUFFER);
 	memset(p1, 0, num1);
 	dsBuffer->Unlock(p1, num1, 0, 0);
-	thread = std::thread(std::mem_fn(&DSound::SoundLoop), this);
+	thread = std::thread(std::mem_fun(&DSound::SoundLoop), this);
 	return true;
 }
 
diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp
index 814f720e6e..cfe6a40630 100644
--- a/Source/Core/AudioCommon/Src/OpenALStream.cpp
+++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp
@@ -15,8 +15,6 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include <functional>
-
 #include "aldlist.h"
 #include "OpenALStream.h"
 #include "DPL2Decoder.h"
@@ -54,7 +52,7 @@ bool OpenALStream::Start()
 				//period_size_in_millisec = 1000 / refresh;
 
 				alcMakeContextCurrent(pContext);
-				thread = std::thread(std::mem_fn(&OpenALStream::SoundLoop), this);
+				thread = std::thread(std::mem_fun(&OpenALStream::SoundLoop), this);
 				bReturn = true;
 			}
 			else
@@ -74,7 +72,7 @@ bool OpenALStream::Start()
 		PanicAlertT("OpenAL: can't find sound devices");
 	}
 
-	// Initialize DPL2 parameters
+	// Initialise DPL2 parameters
 	dpl2reset();
 
 	soundTouch.clear();
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp
index ce416af7e2..93b7cd5d09 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp
+++ b/Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp
@@ -101,7 +101,7 @@ bool GeckoSockServer::GetAvailableSock(sf::SocketTCP &sock_to_fill)
 			recv_fifo = std::queue<u8>();
 			send_fifo = std::queue<u8>();
 		}
-		clientThread = std::thread(std::mem_fn(&GeckoSockServer::ClientThread), this);
+		clientThread = std::thread(std::mem_fun(&GeckoSockServer::ClientThread), this);
 		client_count++;
 		waiting_socks.pop();
 		sock_filled = true;
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
index 30054b274c..cc05bc10e1 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
@@ -264,7 +264,7 @@ bool Wiimote::Connect()
 	// Set LEDs
 	SetLEDs(WIIMOTE_LED_1 << index);
 
-	m_wiimote_thread = std::thread(std::mem_fn(&Wiimote::ThreadFunc), this);
+	m_wiimote_thread = std::thread(std::mem_fun(&Wiimote::ThreadFunc), this);
 
 	// This isn't as drastic as it sounds, since the process in which the threads
 	// reside is normal priority. Needed for keeping audio reports at a decent rate
diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp
index 7293b615b3..ef1edeeb7f 100644
--- a/Source/Core/Core/Src/NetPlayClient.cpp
+++ b/Source/Core/Core/Src/NetPlayClient.cpp
@@ -70,7 +70,7 @@ NetPlayClient::NetPlayClient(const std::string& address, const u16 port, NetPlay
 			is_connected = true;
 
 			m_selector.Add(m_socket);
-			m_thread = std::thread(std::mem_fn(&NetPlayClient::ThreadFunc), this);
+			m_thread = std::thread(std::mem_fun(&NetPlayClient::ThreadFunc), this);
 		}
 	}
 	else
diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp
index 80e00c4656..61a61d00ae 100644
--- a/Source/Core/Core/Src/NetPlayServer.cpp
+++ b/Source/Core/Core/Src/NetPlayServer.cpp
@@ -38,7 +38,7 @@ NetPlayServer::NetPlayServer(const u16 port, const std::string& name, NetPlayUI*
 		is_connected = true;
 
 		m_selector.Add(m_socket);
-		m_thread = std::thread(std::mem_fn(&NetPlayServer::ThreadFunc), this);
+		m_thread = std::thread(std::mem_fun(&NetPlayServer::ThreadFunc), this);
 	}
 	else
 		is_connected = false;
diff --git a/Source/Core/InputCommon/Src/UDPWiimote.cpp b/Source/Core/InputCommon/Src/UDPWiimote.cpp
index 83799f2a43..f14f9ed7e2 100644
--- a/Source/Core/InputCommon/Src/UDPWiimote.cpp
+++ b/Source/Core/InputCommon/Src/UDPWiimote.cpp
@@ -134,7 +134,7 @@ UDPWiimote::UDPWiimote(const char *_port, const char * name, int _index) :
 	initBroadcastIPv6();
 
 	std::lock_guard<std::mutex> lk(d->termLock);
-	d->thread = std::thread(std::mem_fn(&UDPWiimote::mainThread), this);
+	d->thread = std::thread(std::mem_fun(&UDPWiimote::mainThread), this);
 
 	return;
 }