diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index 11586616fe..76565cc23c 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -786,7 +786,7 @@ void Client::Tick()
 #ifndef IGNORE_UPDATES
 				//Check for updates
 				json::Object versions = objDocument["Updates"];
-#if not defined(BETA) && not defined(SNAPSHOT)
+#if !defined(BETA) && !defined(SNAPSHOT)
 				json::Object stableVersion = versions["Stable"];
 				json::Number stableMajor = stableVersion["Major"];
 				json::Number stableMinor = stableVersion["Minor"];
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index b38bbc11ef..8b7c5501b0 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -3,27 +3,21 @@
 #include <math.h>
 #if !defined(_MSC_VER)
 #include <strings.h>
-#else
-#include <windows.h>
 #endif
 #include "Config.h"
 #include "Simulation.h"
 #include "Elements.h"
-//#include "ElementFunctions.h"
 #include "Air.h"
 #include "Gravity.h"
 #include "elements/Element.h"
 #include "CoordStack.h"
 
-//#include "graphics/Renderer.h"
-//#include "graphics/Graphics.h"
 #include "Misc.h"
 #include "ToolClasses.h"
 #include "gui/game/Brush.h"
 #include "client/GameSave.h"
 #include "Sample.h"
 #include "Snapshot.h"
-//#include "StorageClasses.h"
 
 #ifdef LUACONSOLE
 #include "lua/LuaScriptInterface.h"