Index: source/graphics/TextureConverter.cpp
===================================================================
--- source/graphics/TextureConverter.cpp    (revision 22650)
+++ source/graphics/TextureConverter.cpp    (working copy)
@@ -286,8 +286,6 @@

    // Set up the worker thread:

-   int ret;
-
    // Use SDL semaphores since OS X doesn't implement sem_init
    m_WorkerSem = SDL_CreateSemaphore(0);
    ENSURE(m_WorkerSem);
Index: source/graphics/TextureConverter.h
===================================================================
--- source/graphics/TextureConverter.h  (revision 22650)
+++ source/graphics/TextureConverter.h  (working copy)
@@ -23,6 +23,7 @@

 #include "TextureManager.h"

+#include <mutex>
 #include <thread>

 class MD5;
Index: source/lib/timer.cpp
===================================================================
--- source/lib/timer.cpp    (revision 22650)
+++ source/lib/timer.cpp    (working copy)
@@ -27,16 +27,18 @@
 #include "precompiled.h"
 #include "lib/timer.h"

-#include <sstream> // std::stringstream
-#include <numeric>
+#include <cfloat>
 #include <cmath>
-#include <cfloat>
 #include <cstdarg>
+#include <mutex>
+#include <numeric>
+#include <sstream> // std::stringstream

 #include "lib/module_init.h"
 #include "lib/posix/posix_pthread.h"
 #include "lib/posix/posix_time.h"
-# include "lib/sysdep/cpu.h"
+#include "lib/sysdep/cpu.h"
+
 #if OS_WIN
 # include "lib/sysdep/os/win/whrt/whrt.h"
 #endif
Index: source/tools/atlas/GameInterface/GameLoop.cpp
===================================================================
--- source/tools/atlas/GameInterface/GameLoop.cpp   (revision 22650)
+++ source/tools/atlas/GameInterface/GameLoop.cpp   (working copy)
@@ -17,8 +17,6 @@

 #include "precompiled.h"

-#include <thread>
-
 #include "GameLoop.h"

 #include "MessagePasserImpl.h"
@@ -43,6 +41,8 @@
 #include "ps/GameSetup/Paths.h"
 #include "renderer/Renderer.h"

+#include <thread>
+
 using namespace AtlasMessage;