diff --git a/src/BlockPhysics.c b/src/BlockPhysics.c
index 2f47767a1..a75ca7a07 100644
--- a/src/BlockPhysics.c
+++ b/src/BlockPhysics.c
@@ -10,7 +10,7 @@
 #include "MapGenerator.h"
 #include "Platform.h"
 #include "Game.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "Vectors.h"
 #include "Chat.h"
 
diff --git a/src/Deflate.c b/src/Deflate.c
index 9c76ba790..8a275c3bb 100644
--- a/src/Deflate.c
+++ b/src/Deflate.c
@@ -1,5 +1,5 @@
 #include "Deflate.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "Funcs.h"
 #include "Platform.h"
 #include "Stream.h"
diff --git a/src/Entity.c b/src/Entity.c
index 172be30b2..b533313fb 100644
--- a/src/Entity.c
+++ b/src/Entity.c
@@ -18,7 +18,7 @@
 #include "Gui.h"
 #include "Stream.h"
 #include "Bitmap.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 
 NameMode Entities_NameMode;
 ShadowMode Entities_ShadowMode;
diff --git a/src/Event.c b/src/Event.c
index 61790a08f..7ac78ccb7 100644
--- a/src/Event.c
+++ b/src/Event.c
@@ -1,5 +1,5 @@
 #include "Event.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 
 struct Event_Int EntityEvents_Added;
 struct Event_Int EntityEvents_Removed;
diff --git a/src/Formats.c b/src/Formats.c
index f3d880270..d18fa74e0 100644
--- a/src/Formats.c
+++ b/src/Formats.c
@@ -5,7 +5,7 @@
 #include "Entity.h"
 #include "Platform.h"
 #include "ExtMath.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "Game.h"
 #include "ServerConnection.h"
 #include "Event.h"
diff --git a/src/Graphics.c b/src/Graphics.c
index b77c87317..ff7f578aa 100644
--- a/src/Graphics.c
+++ b/src/Graphics.c
@@ -1,5 +1,5 @@
 #include "Graphics.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "Platform.h"
 #include "Window.h"
 #include "Funcs.h"
diff --git a/src/Gui.c b/src/Gui.c
index 42a37f84d..de61103ab 100644
--- a/src/Gui.c
+++ b/src/Gui.c
@@ -8,7 +8,7 @@
 #include "Screens.h"
 #include "Camera.h"
 #include "InputHandler.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "Platform.h"
 #include "Bitmap.h"
 
diff --git a/src/Input.c b/src/Input.c
index 6ab07e296..12f52526e 100644
--- a/src/Input.c
+++ b/src/Input.c
@@ -3,7 +3,7 @@
 #include "Funcs.h"
 #include "Options.h"
 #include "Utils.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "Platform.h"
 #include "Chat.h"
 
diff --git a/src/Lighting.c b/src/Lighting.c
index c2f1e2274..b2f96054f 100644
--- a/src/Lighting.c
+++ b/src/Lighting.c
@@ -4,7 +4,7 @@
 #include "MapRenderer.h"
 #include "Platform.h"
 #include "World.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "Event.h"
 #include "GameStructs.h"
 
diff --git a/src/MapGenerator.c b/src/MapGenerator.c
index 6fcb7f54a..94ab1839b 100644
--- a/src/MapGenerator.c
+++ b/src/MapGenerator.c
@@ -1,6 +1,6 @@
 #include "MapGenerator.h"
 #include "BlockID.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "ExtMath.h"
 #include "Funcs.h"
 #include "Platform.h"
diff --git a/src/Menus.c b/src/Menus.c
index bc911702c..1889b0a99 100644
--- a/src/Menus.c
+++ b/src/Menus.c
@@ -27,7 +27,7 @@
 #include "Deflate.h"
 #include "Stream.h"
 #include "Builder.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 
 #define MenuBase_Layout Screen_Layout struct Widget** Widgets; int WidgetsCount;
 struct Menu { MenuBase_Layout };
diff --git a/src/Options.c b/src/Options.c
index 96d1a3ac4..5fa71044b 100644
--- a/src/Options.c
+++ b/src/Options.c
@@ -6,7 +6,7 @@
 #include "Chat.h"
 #include "Errors.h"
 #include "Utils.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 
 const char* FpsLimit_Names[FPS_LIMIT_COUNT] = {
 	"LimitVSync", "Limit30FPS", "Limit60FPS", "Limit120FPS", "LimitNone",
diff --git a/src/PacketHandlers.c b/src/PacketHandlers.c
index 26f727d6b..113dd25e7 100644
--- a/src/PacketHandlers.c
+++ b/src/PacketHandlers.c
@@ -19,7 +19,7 @@
 #include "Lighting.h"
 #include "AsyncDownloader.h"
 #include "Drawer2D.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "TexturePack.h"
 #include "Gui.h"
 #include "Errors.h"
diff --git a/src/Physics.c b/src/Physics.c
index f42c4c9cd..88125713e 100644
--- a/src/Physics.c
+++ b/src/Physics.c
@@ -5,7 +5,7 @@
 #include "Platform.h"
 #include "ExtMath.h"
 #include "Funcs.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "Entity.h"
 
 
diff --git a/src/Picking.c b/src/Picking.c
index 0c7b86ca7..ba1301cbf 100644
--- a/src/Picking.c
+++ b/src/Picking.c
@@ -6,7 +6,7 @@
 #include "World.h"
 #include "Funcs.h"
 #include "Block.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "Camera.h"
 
 static float pickedPos_dist;
diff --git a/src/Platform.c b/src/Platform.c
index 316a1ee10..ee9ebcfa1 100644
--- a/src/Platform.c
+++ b/src/Platform.c
@@ -1,8 +1,7 @@
 #include "Platform.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "Stream.h"
 #include "ExtMath.h"
-#include "ErrorHandler.h"
 #include "Drawer2D.h"
 #include "Funcs.h"
 #include "AsyncDownloader.h"
diff --git a/src/Program.c b/src/Program.c
index 097445a85..3e21e38b9 100644
--- a/src/Program.c
+++ b/src/Program.c
@@ -1,4 +1,4 @@
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "Platform.h"
 #include "Window.h"
 #include "Constants.h"
diff --git a/src/ServerConnection.c b/src/ServerConnection.c
index 210627648..0fd6ad504 100644
--- a/src/ServerConnection.c
+++ b/src/ServerConnection.c
@@ -17,7 +17,7 @@
 #include "Camera.h"
 #include "TexturePack.h"
 #include "Menus.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "PacketHandlers.h"
 #include "Inventory.h"
 #include "Platform.h"
diff --git a/src/Stream.c b/src/Stream.c
index 5c63245c7..b3bf2e84d 100644
--- a/src/Stream.c
+++ b/src/Stream.c
@@ -1,7 +1,7 @@
 #include "Stream.h"
 #include "Platform.h"
 #include "Funcs.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "Errors.h"
 #include "Utils.h"
 
diff --git a/src/String.c b/src/String.c
index 4eb816d32..fba646710 100644
--- a/src/String.c
+++ b/src/String.c
@@ -1,6 +1,6 @@
 #include "String.h"
 #include "Funcs.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "Platform.h"
 #include "Stream.h"
 #include "Utils.h"
diff --git a/src/Utils.c b/src/Utils.c
index def385407..3d77ce25f 100644
--- a/src/Utils.c
+++ b/src/Utils.c
@@ -5,7 +5,7 @@
 #include "Platform.h"
 #include "Stream.h"
 #include "Errors.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 
 
 /*########################################################################################################################*
diff --git a/src/Widgets.c b/src/Widgets.c
index 54928ab71..964ee5086 100644
--- a/src/Widgets.c
+++ b/src/Widgets.c
@@ -14,7 +14,7 @@
 #include "Event.h"
 #include "Chat.h"
 #include "Game.h"
-#include "ErrorHandler.h"
+#include "Logger.h"
 #include "Bitmap.h"
 #include "Block.h"