diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index 66e2e457b..2acef09df 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -1113,110 +1113,110 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="OS Support"
+				Name="OSSupport"
 				>
 				<File
-					RelativePath="..\source\cBlockingTCPLink.cpp"
+					RelativePath="..\source\OSSupport\BlockingTCPLink.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cBlockingTCPLink.h"
+					RelativePath="..\source\OSSupport\BlockingTCPLink.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cCriticalSection.cpp"
+					RelativePath="..\source\OSSupport\CriticalSection.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cCriticalSection.h"
+					RelativePath="..\source\OSSupport\CriticalSection.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cEvent.cpp"
+					RelativePath="..\source\OSSupport\Event.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cEvent.h"
+					RelativePath="..\source\OSSupport\Event.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cFile.cpp"
+					RelativePath="..\source\OSSupport\File.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cFile.h"
+					RelativePath="..\source\OSSupport\File.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cIsThread.cpp"
+					RelativePath="..\source\OSSupport\IsThread.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cIsThread.h"
+					RelativePath="..\source\OSSupport\IsThread.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cMakeDir.cpp"
+					RelativePath="..\source\OSSupport\MakeDir.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cMakeDir.h"
+					RelativePath="..\source\OSSupport\MakeDir.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSemaphore.cpp"
+					RelativePath="..\source\OSSupport\Semaphore.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSemaphore.h"
+					RelativePath="..\source\OSSupport\Semaphore.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSleep.cpp"
+					RelativePath="..\source\OSSupport\Sleep.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSleep.h"
+					RelativePath="..\source\OSSupport\Sleep.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSocket.cpp"
+					RelativePath="..\source\OSSupport\Socket.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSocket.h"
+					RelativePath="..\source\OSSupport\Socket.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSocketThreads.cpp"
+					RelativePath="..\source\OSSupport\SocketThreads.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSocketThreads.h"
+					RelativePath="..\source\OSSupport\SocketThreads.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cTCPLink.cpp"
+					RelativePath="..\source\OSSupport\TCPLink.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cTCPLink.h"
+					RelativePath="..\source\OSSupport\TCPLink.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cThread.cpp"
+					RelativePath="..\source\OSSupport\Thread.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cThread.h"
+					RelativePath="..\source\OSSupport\Thread.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cTimer.cpp"
+					RelativePath="..\source\OSSupport\Timer.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cTimer.h"
+					RelativePath="..\source\OSSupport\Timer.h"
 					>
 				</File>
 				<Filter
diff --git a/source/AllToLua.pkg b/source/AllToLua.pkg
index 83f3a952c..f10761297 100644
--- a/source/AllToLua.pkg
+++ b/source/AllToLua.pkg
@@ -34,7 +34,7 @@ $cfile "cWebAdmin.h"
 $cfile "cWebPlugin.h"
 $cfile "cPickup.h"
 $cfile "cRoot.h"
-$cfile "cTCPLink.h"
+$cfile "OSSupport/TCPLink.h"
 $cfile "Vector3f.h"
 $cfile "Vector3d.h"
 $cfile "Vector3i.h"
diff --git a/source/Bindings.cpp b/source/Bindings.cpp
index b04902383..8b9718386 100644
--- a/source/Bindings.cpp
+++ b/source/Bindings.cpp
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 09/23/12 23:08:35.
+** Generated automatically by tolua++-1.0.92 on 09/23/12 23:22:26.
 */
 
 #ifndef __cplusplus
@@ -43,7 +43,7 @@ TOLUA_API int  tolua_AllToLua_open (lua_State* tolua_S);
 #include "cWebPlugin.h"
 #include "cPickup.h"
 #include "cRoot.h"
-#include "cTCPLink.h"
+#include "OSSupport/TCPLink.h"
 #include "Vector3f.h"
 #include "Vector3d.h"
 #include "Vector3i.h"
diff --git a/source/Bindings.h b/source/Bindings.h
index 3cae96ba9..9489fa6bb 100644
--- a/source/Bindings.h
+++ b/source/Bindings.h
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 09/23/12 23:08:36.
+** Generated automatically by tolua++-1.0.92 on 09/23/12 23:22:26.
 */
 
 /* Exported function */
diff --git a/source/ChunkSender.h b/source/ChunkSender.h
index ac5e89949..e5f2f7556 100644
--- a/source/ChunkSender.h
+++ b/source/ChunkSender.h
@@ -25,7 +25,7 @@ Note that it may be called by world's BroadcastToChunk() if the client is still
 
 #pragma once
 
-#include "cIsThread.h"
+#include "OSSupport/IsThread.h"
 #include "ChunkDef.h"
 
 
diff --git a/source/Generating/ChunkGenerator.h b/source/Generating/ChunkGenerator.h
index 23cf76751..287ce1108 100644
--- a/source/Generating/ChunkGenerator.h
+++ b/source/Generating/ChunkGenerator.h
@@ -24,7 +24,7 @@ See http://forum.mc-server.org/showthread.php?tid=409 for details.
 
 #pragma once
 
-#include "../cIsThread.h"
+#include "../OSSupport/IsThread.h"
 #include "../ChunkDef.h"
 
 
diff --git a/source/Globals.h b/source/Globals.h
index 1a4a361ee..f8d3a7bbc 100644
--- a/source/Globals.h
+++ b/source/Globals.h
@@ -163,12 +163,12 @@ typedef short     Int16;
 
 // Common headers (part 1, without macros):
 #include "StringUtils.h"
-#include "cSleep.h"
-#include "cCriticalSection.h"
-#include "cSemaphore.h"
-#include "cEvent.h"
-#include "cThread.h"
-#include "cFile.h"
+#include "OSSupport/Sleep.h"
+#include "OSSupport/CriticalSection.h"
+#include "OSSupport/Semaphore.h"
+#include "OSSupport/Event.h"
+#include "OSSupport/Thread.h"
+#include "OSSupport/File.h"
 #include "cMCLogger.h"
 
 
diff --git a/source/LightingThread.h b/source/LightingThread.h
index 96f7c009e..a19bc548e 100644
--- a/source/LightingThread.h
+++ b/source/LightingThread.h
@@ -31,7 +31,7 @@ Chunks from m_PostponedQueue are moved back into m_Queue when their neighbors ge
 
 #pragma once
 
-#include "cIsThread.h"
+#include "OSSupport/IsThread.h"
 #include "ChunkDef.h"
 
 
diff --git a/source/cBlockingTCPLink.cpp b/source/OSSupport/BlockingTCPLink.cpp
similarity index 98%
rename from source/cBlockingTCPLink.cpp
rename to source/OSSupport/BlockingTCPLink.cpp
index d297304cf..55454a4b5 100644
--- a/source/cBlockingTCPLink.cpp
+++ b/source/OSSupport/BlockingTCPLink.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cBlockingTCPLink.h"
+#include "BlockingTCPLink.h"
 
 
 
diff --git a/source/cBlockingTCPLink.h b/source/OSSupport/BlockingTCPLink.h
similarity index 96%
rename from source/cBlockingTCPLink.h
rename to source/OSSupport/BlockingTCPLink.h
index feba52970..4ee0ccb3b 100644
--- a/source/cBlockingTCPLink.h
+++ b/source/OSSupport/BlockingTCPLink.h
@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "cSocket.h"
+#include "Socket.h"
 
 
 
diff --git a/source/cCriticalSection.cpp b/source/OSSupport/CriticalSection.cpp
similarity index 99%
rename from source/cCriticalSection.cpp
rename to source/OSSupport/CriticalSection.cpp
index 47e2c2c2d..f87a2b3ba 100644
--- a/source/cCriticalSection.cpp
+++ b/source/OSSupport/CriticalSection.cpp
@@ -1,6 +1,6 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
-#include "cIsThread.h"
+#include "IsThread.h"
 
 
 
diff --git a/source/cCriticalSection.h b/source/OSSupport/CriticalSection.h
similarity index 100%
rename from source/cCriticalSection.h
rename to source/OSSupport/CriticalSection.h
diff --git a/source/cEvent.cpp b/source/OSSupport/Event.cpp
similarity index 98%
rename from source/cEvent.cpp
rename to source/OSSupport/Event.cpp
index a94fa83bc..13b5c1d3f 100644
--- a/source/cEvent.cpp
+++ b/source/OSSupport/Event.cpp
@@ -1,12 +1,12 @@
 
-// cEvent.cpp
+// Event.cpp
 
 // Implements the cEvent object representing an OS-specific synchronization primitive that can be waited-for
 // Implemented as an Event on Win and as a 1-semaphore on *nix
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cEvent.h"
+#include "Event.h"
 
 
 
diff --git a/source/cEvent.h b/source/OSSupport/Event.h
similarity index 97%
rename from source/cEvent.h
rename to source/OSSupport/Event.h
index bc1505a11..71f418c0c 100644
--- a/source/cEvent.h
+++ b/source/OSSupport/Event.h
@@ -1,5 +1,5 @@
 
-// cEvent.h
+// Event.h
 
 // Interfaces to the cEvent object representing an OS-specific synchronization primitive that can be waited-for
 // Implemented as an Event on Win and as a 1-semaphore on *nix
diff --git a/source/cFile.cpp b/source/OSSupport/File.cpp
similarity index 99%
rename from source/cFile.cpp
rename to source/OSSupport/File.cpp
index 5558bfd45..fdae0b34e 100644
--- a/source/cFile.cpp
+++ b/source/OSSupport/File.cpp
@@ -5,7 +5,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cFile.h"
+#include "File.h"
 
 
 
diff --git a/source/cFile.h b/source/OSSupport/File.h
similarity index 100%
rename from source/cFile.h
rename to source/OSSupport/File.h
diff --git a/source/cIsThread.cpp b/source/OSSupport/IsThread.cpp
similarity index 98%
rename from source/cIsThread.cpp
rename to source/OSSupport/IsThread.cpp
index cfc6fa72a..9dcbc43eb 100644
--- a/source/cIsThread.cpp
+++ b/source/OSSupport/IsThread.cpp
@@ -1,12 +1,12 @@
 
-// cIsThread.cpp
+// IsThread.cpp
 
 // Implements the cIsThread class representing an OS-independent wrapper for a class that implements a thread.
 // This class will eventually suupersede the old cThread class
 
 #include "Globals.h"
 
-#include "cIsThread.h"
+#include "IsThread.h"
 
 
 
diff --git a/source/cIsThread.h b/source/OSSupport/IsThread.h
similarity index 99%
rename from source/cIsThread.h
rename to source/OSSupport/IsThread.h
index e2d53565d..ed9a32852 100644
--- a/source/cIsThread.h
+++ b/source/OSSupport/IsThread.h
@@ -1,5 +1,5 @@
 
-// cIsThread.h
+// IsThread.h
 
 // Interfaces to the cIsThread class representing an OS-independent wrapper for a class that implements a thread.
 // This class will eventually suupersede the old cThread class
diff --git a/source/cMakeDir.cpp b/source/OSSupport/MakeDir.cpp
similarity index 95%
rename from source/cMakeDir.cpp
rename to source/OSSupport/MakeDir.cpp
index 478d1d872..10ccfe9ec 100644
--- a/source/cMakeDir.cpp
+++ b/source/OSSupport/MakeDir.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cMakeDir.h"
+#include "MakeDir.h"
 
 
 
diff --git a/source/cMakeDir.h b/source/OSSupport/MakeDir.h
similarity index 100%
rename from source/cMakeDir.h
rename to source/OSSupport/MakeDir.h
diff --git a/source/cSemaphore.cpp b/source/OSSupport/Semaphore.cpp
similarity index 100%
rename from source/cSemaphore.cpp
rename to source/OSSupport/Semaphore.cpp
diff --git a/source/cSemaphore.h b/source/OSSupport/Semaphore.h
similarity index 100%
rename from source/cSemaphore.h
rename to source/OSSupport/Semaphore.h
diff --git a/source/cSleep.cpp b/source/OSSupport/Sleep.cpp
similarity index 100%
rename from source/cSleep.cpp
rename to source/OSSupport/Sleep.cpp
diff --git a/source/cSleep.h b/source/OSSupport/Sleep.h
similarity index 100%
rename from source/cSleep.h
rename to source/OSSupport/Sleep.h
diff --git a/source/cSocket.cpp b/source/OSSupport/Socket.cpp
similarity index 99%
rename from source/cSocket.cpp
rename to source/OSSupport/Socket.cpp
index 031a1c63a..8d6a5ee94 100644
--- a/source/cSocket.cpp
+++ b/source/OSSupport/Socket.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cSocket.h"
+#include "Socket.h"
 
 #ifndef _WIN32
 	#include <netdb.h>
diff --git a/source/cSocket.h b/source/OSSupport/Socket.h
similarity index 100%
rename from source/cSocket.h
rename to source/OSSupport/Socket.h
diff --git a/source/cSocketThreads.cpp b/source/OSSupport/SocketThreads.cpp
similarity index 99%
rename from source/cSocketThreads.cpp
rename to source/OSSupport/SocketThreads.cpp
index e1fdd8f24..ae23b4496 100644
--- a/source/cSocketThreads.cpp
+++ b/source/OSSupport/SocketThreads.cpp
@@ -6,8 +6,7 @@
 // For more detail, see http://forum.mc-server.org/showthread.php?tid=327
 
 #include "Globals.h"
-#include "cSocketThreads.h"
-#include "cClientHandle.h"
+#include "SocketThreads.h"
 
 
 
diff --git a/source/cSocketThreads.h b/source/OSSupport/SocketThreads.h
similarity index 98%
rename from source/cSocketThreads.h
rename to source/OSSupport/SocketThreads.h
index 4f4e4bbe6..4683e0e4d 100644
--- a/source/cSocketThreads.h
+++ b/source/OSSupport/SocketThreads.h
@@ -1,5 +1,5 @@
 
-// cSocketThreads.h
+// SocketThreads.h
 
 // Interfaces to the cSocketThreads class representing the heart of MCS's client networking.
 // This object takes care of network communication, groups sockets into threads and uses as little threads as possible for full read / write support
@@ -30,8 +30,8 @@ This means that the socket can be written to several times before finally closin
 #ifndef CSOCKETTHREADS_H_INCLUDED
 #define CSOCKETTHREADS_H_INCLUDED
 
-#include "cSocket.h"
-#include "cIsThread.h"
+#include "Socket.h"
+#include "IsThread.h"
 
 
 
diff --git a/source/cTCPLink.cpp b/source/OSSupport/TCPLink.cpp
similarity index 97%
rename from source/cTCPLink.cpp
rename to source/OSSupport/TCPLink.cpp
index 22151b32a..d4c423b94 100644
--- a/source/cTCPLink.cpp
+++ b/source/OSSupport/TCPLink.cpp
@@ -1,8 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cTCPLink.h"
-#include "cSocket.h"
+#include "TCPLink.h"
 
 
 
diff --git a/source/cTCPLink.h b/source/OSSupport/TCPLink.h
similarity index 97%
rename from source/cTCPLink.h
rename to source/OSSupport/TCPLink.h
index 0bba84243..7fca10d7f 100644
--- a/source/cTCPLink.h
+++ b/source/OSSupport/TCPLink.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cSocket.h"
+#include "Socket.h"
 
 class cTCPLink																	//tolua_export
 {																				//tolua_export
diff --git a/source/cThread.cpp b/source/OSSupport/Thread.cpp
similarity index 100%
rename from source/cThread.cpp
rename to source/OSSupport/Thread.cpp
diff --git a/source/cThread.h b/source/OSSupport/Thread.h
similarity index 100%
rename from source/cThread.h
rename to source/OSSupport/Thread.h
diff --git a/source/cTimer.cpp b/source/OSSupport/Timer.cpp
similarity index 97%
rename from source/cTimer.cpp
rename to source/OSSupport/Timer.cpp
index a68ad2480..ab7325b5e 100644
--- a/source/cTimer.cpp
+++ b/source/OSSupport/Timer.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cTimer.h"
+#include "Timer.h"
 
 
 
diff --git a/source/cTimer.h b/source/OSSupport/Timer.h
similarity index 100%
rename from source/cTimer.h
rename to source/OSSupport/Timer.h
diff --git a/source/WorldStorage/WSSAnvil.cpp b/source/WorldStorage/WSSAnvil.cpp
index e10c0e99a..b39dee7c7 100644
--- a/source/WorldStorage/WSSAnvil.cpp
+++ b/source/WorldStorage/WSSAnvil.cpp
@@ -15,7 +15,7 @@
 #include "../cItem.h"
 #include "../StringCompression.h"
 #include "../cEntity.h"
-#include "../cMakeDir.h"
+#include "../OSSupport/MakeDir.h"
 #include "FastNBT.h"
 
 
diff --git a/source/WorldStorage/WorldStorage.h b/source/WorldStorage/WorldStorage.h
index 117def9b5..064b2ffaf 100644
--- a/source/WorldStorage/WorldStorage.h
+++ b/source/WorldStorage/WorldStorage.h
@@ -15,7 +15,7 @@
 #define WORLDSTORAGE_H_INCLUDED
 
 #include "../ChunkDef.h"
-#include "../cIsThread.h"
+#include "../OSSupport/IsThread.h"
 #include <json/json.h>
 
 
diff --git a/source/cAuthenticator.cpp b/source/cAuthenticator.cpp
index 9d06e7f40..171c90598 100644
--- a/source/cAuthenticator.cpp
+++ b/source/cAuthenticator.cpp
@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "cAuthenticator.h"
-#include "cBlockingTCPLink.h"
+#include "OSSupport/BlockingTCPLink.h"
 #include "cRoot.h"
 #include "cServer.h"
 
diff --git a/source/cAuthenticator.h b/source/cAuthenticator.h
index 4d0bd1bbb..c9e647329 100644
--- a/source/cAuthenticator.h
+++ b/source/cAuthenticator.h
@@ -14,7 +14,7 @@
 #ifndef CAUTHENTICATOR_H_INCLUDED
 #define CAUTHENTICATOR_H_INCLUDED
 
-#include "cIsThread.h"
+#include "OSSupport/IsThread.h"
 
 
 
diff --git a/source/cChunkMap.cpp b/source/cChunkMap.cpp
index 7c85e5994..a53357c50 100644
--- a/source/cChunkMap.cpp
+++ b/source/cChunkMap.cpp
@@ -4,7 +4,6 @@
 #include "cChunkMap.h"
 #include "cWorld.h"
 #include "cRoot.h"
-#include "cMakeDir.h"
 #include "cPlayer.h"
 #include "BlockID.h"
 #include "cItem.h"
diff --git a/source/cClientHandle.cpp b/source/cClientHandle.cpp
index 0212bd3b2..a910d53d7 100644
--- a/source/cClientHandle.cpp
+++ b/source/cClientHandle.cpp
@@ -21,8 +21,8 @@
 #include "cPiston.h"
 #include "Mobs/Monster.h"
 #include "cChatColor.h"
-#include "cSocket.h"
-#include "cTimer.h"
+#include "OSSupport/Socket.h"
+#include "OSSupport/Timer.h"
 #include "items/Item.h"
 #include "blocks/Block.h"
 #include "ChunkDataSerializer.h"
@@ -31,10 +31,8 @@
 #include "Vector3f.h"
 #include "Vector3d.h"
 
-#include "cSleep.h"
 #include "cRoot.h"
 
-#include "cBlockingTCPLink.h"
 #include "cAuthenticator.h"
 #include "MersenneTwister.h"
 
diff --git a/source/cClientHandle.h b/source/cClientHandle.h
index 78c6a1289..83d0fd9c0 100644
--- a/source/cClientHandle.h
+++ b/source/cClientHandle.h
@@ -13,7 +13,7 @@
 
 #include "Defines.h"
 #include "Vector3d.h"
-#include "cSocketThreads.h"
+#include "OSSupport/SocketThreads.h"
 #include "ChunkDef.h"
 #include "ByteBuffer.h"
 
diff --git a/source/cHeartBeat.cpp b/source/cHeartBeat.cpp
index 5ac119593..1cff0abb2 100644
--- a/source/cHeartBeat.cpp
+++ b/source/cHeartBeat.cpp
@@ -7,7 +7,6 @@
 
 #include "cRoot.h"
 #include "cServer.h"
-#include "cSleep.h"
 
 
 
diff --git a/source/cHeartBeat.h b/source/cHeartBeat.h
index 416494701..79465507c 100644
--- a/source/cHeartBeat.h
+++ b/source/cHeartBeat.h
@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "cTCPLink.h"
+#include "OSSupport/TCPLink.h"
 
 
 
diff --git a/source/cLog.cpp b/source/cLog.cpp
index da95ee8cc..142aabe28 100644
--- a/source/cLog.cpp
+++ b/source/cLog.cpp
@@ -5,13 +5,12 @@
 
 #include <fstream>
 #include <ctime>
-#include "cMakeDir.h"
-
-#include "cIsThread.h"
+#include "OSSupport/MakeDir.h"
+#include "OSSupport/IsThread.h"
 
 #if defined(ANDROID_NDK)
-#include <android/log.h>
-#include "ToJava.h"
+	#include <android/log.h>
+	#include "ToJava.h"
 #endif
 
 
diff --git a/source/cPlayer.cpp b/source/cPlayer.cpp
index 65132296f..1de9bf36a 100644
--- a/source/cPlayer.cpp
+++ b/source/cPlayer.cpp
@@ -16,8 +16,8 @@
 #include "cItem.h"
 #include "cTracer.h"
 #include "cRoot.h"
-#include "cMakeDir.h"
-#include "cTimer.h"
+#include "OSSupport/MakeDir.h"
+#include "OSSupport/Timer.h"
 #include "MersenneTwister.h"
 
 #include "Vector3d.h"
diff --git a/source/cRedstoneSimulator.cpp b/source/cRedstoneSimulator.cpp
index 44a6bdb4c..8d46b1347 100644
--- a/source/cRedstoneSimulator.cpp
+++ b/source/cRedstoneSimulator.cpp
@@ -4,7 +4,6 @@
 #include "cPiston.h"
 #include "cWorld.h"
 #include "BlockID.h"
-#include "cCriticalSection.h"
 #include "cTorch.h"
 
 #include "cRedstone.h"
diff --git a/source/cServer.cpp b/source/cServer.cpp
index cd7710fb8..e8b58c756 100644
--- a/source/cServer.cpp
+++ b/source/cServer.cpp
@@ -5,9 +5,9 @@
 
 #include "cServer.h"
 #include "cClientHandle.h"
-#include "cTimer.h"
+#include "OSSupport/Timer.h"
 #include "Mobs/Monster.h"
-#include "cSocket.h"
+#include "OSSupport/Socket.h"
 #include "cRoot.h"
 #include "cWorld.h"
 #include "ChunkDef.h"
diff --git a/source/cServer.h b/source/cServer.h
index 9dd087299..b3599aa1e 100644
--- a/source/cServer.h
+++ b/source/cServer.h
@@ -11,7 +11,7 @@
 #ifndef CSERVER_H_INCLUDED
 #define CSERVER_H_INCLUDED
 
-#include "cSocketThreads.h"
+#include "OSSupport/SocketThreads.h"
 #include "CryptoPP/rsa.h"
 #include "CryptoPP/randpool.h"
 
diff --git a/source/cWebAdmin.h b/source/cWebAdmin.h
index 8d4837e7a..f50de3f64 100644
--- a/source/cWebAdmin.h
+++ b/source/cWebAdmin.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../WebServer/WebServer.h"
-#include "cSocket.h"
+#include "OSSupport/Socket.h"
 
 class cStringMap;
 
diff --git a/source/cWorld.cpp b/source/cWorld.cpp
index 533ee70cf..dd5f216d1 100644
--- a/source/cWorld.cpp
+++ b/source/cWorld.cpp
@@ -38,7 +38,7 @@
 #include "Mobs/Ghast.h"
 #include "Mobs/Zombiepigman.h"
 
-#include "cMakeDir.h"
+#include "OSSupport/MakeDir.h"
 #include "MersenneTwister.h"
 #include "cTracer.h"
 #include "Generating/Trees.h"