diff --git a/src/GUI/axisitem.h b/src/GUI/axisitem.h
index b5f19596..e6c985df 100644
--- a/src/GUI/axisitem.h
+++ b/src/GUI/axisitem.h
@@ -4,6 +4,7 @@
 #include <QGraphicsItem>
 #include <QVector>
 #include <QLocale>
+#include <QFont>
 #include "common/range.h"
 
 class AxisItem : public QGraphicsItem
diff --git a/src/GUI/infoitem.h b/src/GUI/infoitem.h
index 774a014c..19644fdb 100644
--- a/src/GUI/infoitem.h
+++ b/src/GUI/infoitem.h
@@ -3,6 +3,7 @@
 
 #include <QGraphicsItem>
 #include <QList>
+#include <QFont>
 #include "common/kv.h"
 
 class InfoItem : public QGraphicsItem
diff --git a/src/GUI/motioninfoitem.h b/src/GUI/motioninfoitem.h
index 4385b84a..30a223c4 100644
--- a/src/GUI/motioninfoitem.h
+++ b/src/GUI/motioninfoitem.h
@@ -2,6 +2,7 @@
 #define MOTIONINFOITEM_H
 
 #include <QGraphicsItem>
+#include <QFont>
 #include "units.h"
 
 class MotionInfoItem : public QGraphicsItem
diff --git a/src/GUI/pathtickitem.h b/src/GUI/pathtickitem.h
index d47da2ae..093f10d0 100644
--- a/src/GUI/pathtickitem.h
+++ b/src/GUI/pathtickitem.h
@@ -3,6 +3,7 @@
 
 #include <QFont>
 #include <QGraphicsItem>
+#include <QtMath>
 #include "graphicsscene.h"
 
 class PathTickItem : public GraphicsItem
@@ -16,7 +17,7 @@ public:
 
 	void setPos(const QPointF &pos);
 	void setColor(const QColor &color) {_brush = QBrush(color);}
-	void setDigitalZoom(int zoom) {setScale(pow(2, -zoom));}
+	void setDigitalZoom(int zoom) {setScale(qPow(2, -zoom));}
 
 	int type() const {return parentItem()->type();}
 	ToolTip info() const
diff --git a/src/GUI/scaleitem.h b/src/GUI/scaleitem.h
index 53b27287..901edf03 100644
--- a/src/GUI/scaleitem.h
+++ b/src/GUI/scaleitem.h
@@ -2,6 +2,7 @@
 #define SCALEITEM_H
 
 #include <QGraphicsItem>
+#include <QFont>
 #include "units.h"
 
 class ScaleItem : public QGraphicsItem
diff --git a/src/GUI/sliderinfoitem.h b/src/GUI/sliderinfoitem.h
index b9595b05..491f8801 100644
--- a/src/GUI/sliderinfoitem.h
+++ b/src/GUI/sliderinfoitem.h
@@ -2,6 +2,7 @@
 #define SLIDERINFOITEM_H
 
 #include <QGraphicsItem>
+#include <QFont>
 
 class SliderInfoItem : public QGraphicsItem
 {
diff --git a/src/common/hash.h b/src/common/hash.h
index 2e62af9d..c25752ea 100644
--- a/src/common/hash.h
+++ b/src/common/hash.h
@@ -2,9 +2,12 @@
 #define HASH_H
 
 #include <QtGlobal>
-#include <QPoint>
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#include <QPoint>
+#include <QPair>
+#include <QHash>
+
 #define HASH_T uint
 
 inline uint qHash(const QPoint &p)
diff --git a/src/map/IMG/shield.h b/src/map/IMG/shield.h
index f6bf48af..30896637 100644
--- a/src/map/IMG/shield.h
+++ b/src/map/IMG/shield.h
@@ -2,6 +2,7 @@
 #define IMG_SHIELD_H
 
 #include <QString>
+#include <QDebug>
 #include "common/hash.h"
 
 #define FIRST_SHIELD Shield::USInterstate