12 files changed, 15 insertions, 21 deletions
diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp
index 5228257..8eaa985 100644
--- a/src/AlsaDriver.cpp
+++ b/src/AlsaDriver.cpp
@@ -18,11 +18,11 @@
 
 #include "ClientID.hpp"
 #include "ClientInfo.hpp"
-#include "Patchage.hpp"
-#include "PatchageCanvas.hpp"
+#include "ILog.hpp"
 #include "PortInfo.hpp"
 #include "PortType.hpp"
 #include "SignalDirection.hpp"
+#include "warnings.hpp"
 
 PATCHAGE_DISABLE_FMT_WARNINGS
 #include <fmt/core.h>
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index 1c75261..04b705a 100644
--- a/src/Configuration.cpp
+++ b/src/Configuration.cpp
@@ -16,7 +16,6 @@
 
 #include "Configuration.hpp"
 
-#include "Patchage.hpp"
 #include "PortType.hpp"
 #include "SignalDirection.hpp"
 
diff --git a/src/JackDbusDriver.cpp b/src/JackDbusDriver.cpp
index 6d59a9e..e998c66 100644
--- a/src/JackDbusDriver.cpp
+++ b/src/JackDbusDriver.cpp
@@ -17,8 +17,6 @@
 
 #include "JackDbusDriver.hpp"
 
-#include "patchage_config.h"
-
 #include "Driver.hpp"
 #include "ILog.hpp"
 #include "PatchageEvent.hpp"
diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp
index b9ae615..4ed8a55 100644
--- a/src/JackDriver.cpp
+++ b/src/JackDriver.cpp
@@ -18,16 +18,15 @@
 
 #include "ClientID.hpp"
 #include "ILog.hpp"
-#include "Patchage.hpp"
-#include "PatchageCanvas.hpp"
 #include "PatchageEvent.hpp"
 #include "PortNames.hpp"
 #include "PortType.hpp"
 #include "SignalDirection.hpp"
+#include "jackey.h"
 #include "patchage_config.h"
+#include "warnings.hpp"
 
 #ifdef HAVE_JACK_METADATA
-#	include "jackey.h"
 #	include <jack/metadata.h>
 #endif
 
diff --git a/src/JackDriver.hpp b/src/JackDriver.hpp
index b25722f..b0dec7a 100644
--- a/src/JackDriver.hpp
+++ b/src/JackDriver.hpp
@@ -21,7 +21,6 @@
 #include "Driver.hpp"
 #include "PortInfo.hpp"
 
-#include <glibmm/thread.h>
 #include <jack/jack.h>
 
 #include <cstdint>
diff --git a/src/Metadata.cpp b/src/Metadata.cpp
index d717387..d628981 100644
--- a/src/Metadata.cpp
+++ b/src/Metadata.cpp
@@ -16,6 +16,13 @@
 
 #include "Metadata.hpp"
 
+#include "ClientID.hpp"
+#include "ClientInfo.hpp"
+#include "PortID.hpp"
+#include "PortInfo.hpp"
+
+#include <boost/optional.hpp>
+
 boost::optional<ClientInfo>
 Metadata::client(const ClientID& id)
 {
diff --git a/src/Metadata.hpp b/src/Metadata.hpp
index 4e4a946..3fa60c6 100644
--- a/src/Metadata.hpp
+++ b/src/Metadata.hpp
@@ -25,7 +25,6 @@
 #include <boost/optional.hpp>
 
 #include <map>
-#include <string>
 
 /// Cache of metadata about clients and ports beyond their IDs
 class Metadata
diff --git a/src/PatchageModule.hpp b/src/PatchageModule.hpp
index d55e381..7c3f191 100644
--- a/src/PatchageModule.hpp
+++ b/src/PatchageModule.hpp
@@ -18,7 +18,7 @@
 #define PATCHAGE_PATCHAGEMODULE_HPP
 
 #include "ClientID.hpp"
-#include "Configuration.hpp"
+#include "SignalDirection.hpp"
 #include "warnings.hpp"
 
 PATCHAGE_DISABLE_GANV_WARNINGS
diff --git a/src/PatchagePort.hpp b/src/PatchagePort.hpp
index 54fa185..3a29322 100644
--- a/src/PatchagePort.hpp
+++ b/src/PatchagePort.hpp
@@ -17,8 +17,6 @@
 #ifndef PATCHAGE_PATCHAGEPORT_HPP
 #define PATCHAGE_PATCHAGEPORT_HPP
 
-#include "patchage_config.h"
-
 #include "Configuration.hpp"
 #include "PatchageCanvas.hpp"
 #include "PatchageModule.hpp"
diff --git a/src/PortNames.hpp b/src/PortNames.hpp
index f1f5391..b8cb187 100644
--- a/src/PortNames.hpp
+++ b/src/PortNames.hpp
@@ -17,6 +17,8 @@
 #ifndef PATCHAGE_PORTNAMES_HPP
 #define PATCHAGE_PORTNAMES_HPP
 
+#include "PortID.hpp"
+
 #include <cassert>
 #include <string>
 
diff --git a/src/binary_location.h b/src/binary_location.h
index f949649..6a996e9 100644
--- a/src/binary_location.h
+++ b/src/binary_location.h
@@ -20,7 +20,6 @@
 
 #include <dlfcn.h>
 
-#include <cassert>
 #include <climits>
 #include <cstdlib>
 #include <string>
diff --git a/src/handle_event.cpp b/src/handle_event.cpp
index 200f819..98a81f3 100644
--- a/src/handle_event.cpp
+++ b/src/handle_event.cpp
@@ -15,16 +15,10 @@
  */
 
 #include "handle_event.hpp"
-#include "event_to_string.hpp"
-
-#include "PatchageEvent.hpp"
-
-#include "patchage_config.h"
-
-#include "event_to_string.hpp"
 
 #include "Patchage.hpp"
 #include "PatchageCanvas.hpp"
+#include "PatchageEvent.hpp"
 #include "PatchageModule.hpp"
 #include "PatchagePort.hpp"