diff --git a/Source/Core/Common/Thread.h b/Source/Core/Common/Thread.h
index 33802a20b7..359137b8fe 100644
--- a/Source/Core/Common/Thread.h
+++ b/Source/Core/Common/Thread.h
@@ -4,10 +4,6 @@
 
 #pragma once
 
-#include <condition_variable>
-#include <cstdio>
-#include <cstring>
-#include <mutex>
 #include <thread>
 
 // Don't include Common.h here as it will break LogManager
@@ -18,10 +14,6 @@
 #ifndef INFINITE
 #define INFINITE 0xffffffff
 #endif
-
-//for gettimeofday and struct time(spec|val)
-#include <time.h>
-#include <sys/time.h>
 #endif
 
 namespace Common
@@ -32,42 +24,6 @@ int CurrentThreadId();
 void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask);
 void SetCurrentThreadAffinity(u32 mask);
 
-// TODO: doesn't work on Windows with (count > 2)
-class Barrier
-{
-public:
-	Barrier(size_t count)
-		: m_count(count), m_waiting(0)
-	{}
-
-	// block until "count" threads call Sync()
-	bool Sync()
-	{
-		std::unique_lock<std::mutex> lk(m_mutex);
-
-		// TODO: broken when next round of Sync()s
-		// is entered before all waiting threads return from the notify_all
-
-		if (m_count == ++m_waiting)
-		{
-			m_waiting = 0;
-			m_condvar.notify_all();
-			return true;
-		}
-		else
-		{
-			m_condvar.wait(lk, [&]{ return (0 == m_waiting); });
-			return false;
-		}
-	}
-
-private:
-	std::condition_variable m_condvar;
-	std::mutex m_mutex;
-	const size_t m_count;
-	volatile size_t m_waiting;
-};
-
 void SleepCurrentThread(int ms);
 void SwitchCurrentThread(); // On Linux, this is equal to sleep 1ms
 
diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h
index 810654ed6f..1c62002dd3 100644
--- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h
+++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <condition_variable>
 #include <mutex>
 #include <string>
 #include <thread>
diff --git a/Source/Core/Core/NetPlayClient.h b/Source/Core/Core/NetPlayClient.h
index 9180925c80..1aa3d2c221 100644
--- a/Source/Core/Core/NetPlayClient.h
+++ b/Source/Core/Core/NetPlayClient.h
@@ -5,12 +5,13 @@
 #pragma once
 
 #include <map>
+#include <mutex>
 #include <queue>
 #include <sstream>
+#include <thread>
 #include <SFML/Network/Packet.hpp>
 #include "Common/CommonTypes.h"
 #include "Common/FifoQueue.h"
-#include "Common/Thread.h"
 #include "Common/TraversalClient.h"
 #include "Core/NetPlayProto.h"
 #include "InputCommon/GCPadStatus.h"
diff --git a/Source/Core/Core/NetPlayServer.h b/Source/Core/Core/NetPlayServer.h
index 1e029e8db4..e172e012bd 100644
--- a/Source/Core/Core/NetPlayServer.h
+++ b/Source/Core/Core/NetPlayServer.h
@@ -5,11 +5,12 @@
 #pragma once
 
 #include <map>
+#include <mutex>
 #include <queue>
 #include <sstream>
+#include <thread>
 #include <unordered_set>
 #include <SFML/Network/Packet.hpp>
-#include "Common/Thread.h"
 #include "Common/Timer.h"
 #include "Common/TraversalClient.h"
 #include "Core/NetPlayProto.h"
diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h
index 3535284d2e..8e3e830d3f 100644
--- a/Source/Core/VideoCommon/RenderBase.h
+++ b/Source/Core/VideoCommon/RenderBase.h
@@ -14,6 +14,7 @@
 
 #pragma once
 
+#include <mutex>
 #include <string>
 
 #include "Common/MathUtil.h"