diff --git a/common/Unit.hpp b/common/Unit.hpp
index 4bac605c6c79..d7f1d7f04101 100644
--- a/common/Unit.hpp
+++ b/common/Unit.hpp
@@ -7,6 +7,10 @@
 
 #pragma once
 
+#include <common/StateEnum.hpp>
+#include <common/Util.hpp>
+#include <net/Socket.hpp>
+
 #include <cassert>
 #include <chrono>
 #include <map>
@@ -14,9 +18,6 @@
 #include <string>
 #include <vector>
 
-#include <common/StateEnum.hpp>
-#include "Util.hpp"
-#include "net/Socket.hpp"
 #include <Poco/Exception.h>
 
 #include <test/testlog.hpp>
diff --git a/common/Util.hpp b/common/Util.hpp
index 9f224d0e16f1..6785312466cc 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -22,7 +22,6 @@
 #include <atomic>
 #include <limits>
 #include <mutex>
-#include <ratio>
 #include <set>
 #include <sstream>
 #include <string>
diff --git a/test/KitPidHelpers.cpp b/test/KitPidHelpers.cpp
index fa5767d81e52..e924c28dac9d 100644
--- a/test/KitPidHelpers.cpp
+++ b/test/KitPidHelpers.cpp
@@ -10,6 +10,12 @@
  */
 #include "KitPidHelpers.hpp"
 
+#include <wsd/COOLWSD.hpp>
+
+#include <lokassert.hpp>
+#include <testlog.hpp>
+
+#include <csignal>
 #include <set>
 #include <chrono>
 #include <iostream>
@@ -17,11 +23,6 @@
 #include <thread>
 #include <string>
 
-#include <wsd/COOLWSD.hpp>
-
-#include <lokassert.hpp>
-#include <testlog.hpp>
-
 std::string getPidList(const std::set<pid_t>& pids);
 
 std::set<pid_t> helpers::getKitPids() { return COOLWSD::getKitPids(); }
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 7727411601d6..850ecf208f0b 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -12,6 +12,7 @@
 #include <config.h>
 
 #include <chrono>
+#include <csignal>
 #include <iomanip>
 #include <sstream>
 #include <string>
diff --git a/wsd/AdminModel.cpp b/wsd/AdminModel.cpp
index e592a4bcaf56..eef6807012c7 100644
--- a/wsd/AdminModel.cpp
+++ b/wsd/AdminModel.cpp
@@ -16,6 +16,7 @@
 
 #include <chrono>
 #include <cmath>
+#include <csignal>
 #include <memory>
 #include <set>
 #include <sstream>
diff --git a/wsd/COOLWSD.hpp b/wsd/COOLWSD.hpp
index 9ece3e7993a0..bd2a6d38553e 100644
--- a/wsd/COOLWSD.hpp
+++ b/wsd/COOLWSD.hpp
@@ -13,8 +13,8 @@
 
 #include <common/ConfigUtil.hpp>
 #include <common/FileUtil.hpp>
+#include <common/Unit.hpp>
 #include <common/Util.hpp>
-#include <net/WebSocketHandler.hpp>
 
 #include <algorithm>
 #include <atomic>
@@ -25,9 +25,6 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <string>
-#include <utility>
-
-#include <signal.h>
 
 #include <Poco/Path.h>
 #include <Poco/Util/AbstractConfiguration.h>
@@ -37,10 +34,12 @@
 class WSProcess;
 class ForKitProcess;
 class ChildProcess;
-class TraceFileWriter;
-class DocumentBroker;
 class ClipboardCache;
+class DocumentBroker;
 class FileServerRequestHandler;
+class ForKitProcess;
+class SocketPoll;
+class TraceFileWriter;
 
 std::shared_ptr<ChildProcess> getNewChild_Blocks(SocketPoll &destPoll, unsigned mobileAppDocId);
 
diff --git a/wsd/Process.hpp b/wsd/Process.hpp
index 3755e93c2418..2b94b162ed01 100644
--- a/wsd/Process.hpp
+++ b/wsd/Process.hpp
@@ -15,6 +15,7 @@
 
 #include <atomic>
 #include <chrono>
+#include <csignal>
 #include <string>
 
 class ChildProcess;
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index 14e2bcebaf92..29f7f565e8a6 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -13,10 +13,11 @@
 
 #pragma once
 
-#include "COOLWSD.hpp"
-#include "Log.hpp"
 #include <common/Authorization.hpp>
+#include <common/Common.hpp>
 #include <common/ConfigUtil.hpp>
+#include <common/Log.hpp>
+#include <wsd/COOLWSD.hpp>
 
 #include <Poco/URI.h>
 
diff --git a/wsd/wopi/WopiProxy.cpp b/wsd/wopi/WopiProxy.cpp
index 597c1a4f9c40..6e87d9a6277f 100644
--- a/wsd/wopi/WopiProxy.cpp
+++ b/wsd/wopi/WopiProxy.cpp
@@ -16,6 +16,7 @@
 #include "FileUtil.hpp"
 #include "HttpHelper.hpp"
 #include "HttpRequest.hpp"
+#include "Protocol.hpp"
 #include <COOLWSD.hpp>
 #include <Exceptions.hpp>
 #include <Log.hpp>