diff --git a/src/util/battery/battery.h b/src/util/battery/battery.h
index 6eef33bc5dd..5efc71d0b0e 100644
--- a/src/util/battery/battery.h
+++ b/src/util/battery/battery.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "util/timer.h"
+#include <QObject>
+#include <QTimer>
 
 class Battery : public QObject {
     Q_OBJECT
diff --git a/src/util/battery/batterylinux.cpp b/src/util/battery/batterylinux.cpp
index 5ae4fa897bf..970e4020aea 100644
--- a/src/util/battery/batterylinux.cpp
+++ b/src/util/battery/batterylinux.cpp
@@ -7,6 +7,7 @@
 #include <QtDebug>
 
 #include "moc_batterylinux.cpp"
+#include "util/assert.h"
 
 BatteryLinux::BatteryLinux(QObject* pParent)
     : Battery(pParent),
diff --git a/src/util/timer.cpp b/src/util/timer.cpp
index 30c29d64719..bd7f570f4fb 100644
--- a/src/util/timer.cpp
+++ b/src/util/timer.cpp
@@ -1,9 +1,6 @@
 #include "util/timer.h"
 
-#include "moc_timer.cpp"
 #include "util/experiment.h"
-#include "util/time.h"
-#include "waveform/guitick.h"
 
 Timer::Timer(QString key, Stat::ComputeFlags compute)
         : m_key(std::move(key)),
diff --git a/src/util/timer.h b/src/util/timer.h
index 51948b0d3ef..3118d218f9c 100644
--- a/src/util/timer.h
+++ b/src/util/timer.h
@@ -1,13 +1,11 @@
 #pragma once
 
-#include <QObject>
+#include <QString>
 #include <QStringView>
 #include <optional>
 
-#include "control/controlproxy.h"
 #include "util/cmdlineargs.h"
 #include "util/duration.h"
-#include "util/parented_ptr.h"
 #include "util/performancetimer.h"
 #include "util/stat.h"