diff --git a/src/thread/thread.h b/src/thread/thread.h
--- a/src/thread/thread.h
+++ b/src/thread/thread.h
@@ -51,73 +51,6 @@ public:
 };
 
 /**
- * Cross-platform Mutex
- */
-class ThreadMutex {
-public:
-	/**
-	 * Create a new mutex.
-	 */
-	static ThreadMutex *New();
-
-	/**
-	 * Virtual Destructor to avoid compiler warnings.
-	 */
-	virtual ~ThreadMutex() {};
-
-	/**
-	 * Begin the critical section
-	 * @param allow_recursive Whether recursive locking is intentional.
-	 *                        If false, NOT_REACHED() will be called when the mutex is already locked
-	 *                        by the current thread.
-	 */
-	virtual void BeginCritical(bool allow_recursive = false) = 0;
-
-	/**
-	 * End of the critical section
-	 * @param allow_recursive Whether recursive unlocking is intentional.
-	 *                        If false, NOT_REACHED() will be called when the mutex was locked more
-	 *                        than once by the current thread.
-	 */
-	virtual void EndCritical(bool allow_recursive = false) = 0;
-
-	/**
-	 * Wait for a signal to be send.
-	 * @pre You must be in the critical section.
-	 * @note While waiting the critical section is left.
-	 * @post You will be in the critical section.
-	 */
-	virtual void WaitForSignal() = 0;
-
-	/**
-	 * Send a signal and wake the 'thread' that was waiting for it.
-	 */
-	virtual void SendSignal() = 0;
-};
-
-/**
- * Simple mutex locker to keep a mutex locked until the locker goes out of scope.
- */
-class ThreadMutexLocker {
-public:
-	/**
-	 * Lock the mutex and keep it locked for the life time of this object.
-	 * @param mutex Mutex to be locked.
-	 */
-	ThreadMutexLocker(ThreadMutex *mutex) : mutex(mutex) { mutex->BeginCritical(); }
-
-	/**
-	 * Unlock the mutex.
-	 */
-	~ThreadMutexLocker() { this->mutex->EndCritical(); }
-
-private:
-	ThreadMutexLocker(const ThreadMutexLocker &) { NOT_REACHED(); }
-	ThreadMutexLocker &operator=(const ThreadMutexLocker &) { NOT_REACHED(); return *this; }
-	ThreadMutex *mutex;
-};
-
-/**
  * Get number of processor cores in the system, including HyperThreading or similar.
  * @return Total number of processor cores.
  */