diff --git a/src/tools/dilate.cpp b/src/tools/dilate.cpp
index 96cd80a62..66321644f 100644
--- a/src/tools/dilate.cpp
+++ b/src/tools/dilate.cpp
@@ -1,7 +1,6 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <base/logger.h>
-#include <base/math.h>
 #include <base/system.h>
 #include <engine/shared/image_manipulation.h>
 #include <pnglite.h>
diff --git a/src/tools/map_convert_07.cpp b/src/tools/map_convert_07.cpp
index 83b76b2e8..accd29417 100644
--- a/src/tools/map_convert_07.cpp
+++ b/src/tools/map_convert_07.cpp
@@ -2,7 +2,6 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.  */
 
 #include <base/logger.h>
-#include <base/math.h>
 #include <base/system.h>
 #include <engine/graphics.h>
 #include <engine/shared/datafile.h>
diff --git a/src/tools/map_diff.cpp b/src/tools/map_diff.cpp
index e4086c482..07dab55e0 100644
--- a/src/tools/map_diff.cpp
+++ b/src/tools/map_diff.cpp
@@ -5,8 +5,6 @@
 #include <game/gamecore.h>
 #include <game/mapitems.h>
 
-#include <pnglite.h>
-
 bool Process(IStorage *pStorage, const char **pMapNames)
 {
 	CDataFileReader Maps[2];
diff --git a/src/tools/map_optimize.cpp b/src/tools/map_optimize.cpp
index 4755a1898..aaa8c8f50 100644
--- a/src/tools/map_optimize.cpp
+++ b/src/tools/map_optimize.cpp
@@ -1,13 +1,11 @@
 #include <algorithm>
 #include <base/logger.h>
-#include <base/math.h>
 #include <base/system.h>
 #include <cstdint>
 #include <engine/shared/datafile.h>
 #include <engine/shared/image_manipulation.h>
 #include <engine/storage.h>
 #include <game/mapitems.h>
-#include <utility>
 #include <vector>
 
 void ClearTransparentPixels(uint8_t *pImg, int Width, int Height)
diff --git a/src/tools/map_replace_image.cpp b/src/tools/map_replace_image.cpp
index 51130dc0d..3faef3715 100644
--- a/src/tools/map_replace_image.cpp
+++ b/src/tools/map_replace_image.cpp
@@ -2,7 +2,6 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.  */
 
 #include <base/logger.h>
-#include <base/math.h>
 #include <base/system.h>
 #include <engine/graphics.h>
 #include <engine/shared/datafile.h>