diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index 0232cd46d7..2aaa5d43e7 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -36,7 +36,6 @@
 #include "control_protocol/control_protocol.h"
 #include "midi_byte_array.h"
 #include "controls.h"
-#include "mackie_port.h"
 #include "mackie_jog_wheel.h"
 #include "mackie_midi_builder.h"
 #include "timer.h"
diff --git a/libs/surfaces/mackie/mackie_midi_builder.cc b/libs/surfaces/mackie/mackie_midi_builder.cc
index a57725baa5..f7c47f2aba 100644
--- a/libs/surfaces/mackie/mackie_midi_builder.cc
+++ b/libs/surfaces/mackie/mackie_midi_builder.cc
@@ -38,8 +38,8 @@
 #include "jog.h"
 #include "meter.h"
 #include "midi_byte_array.h"
-#include "mackie_port.h"
 #include "surface.h"
+#include "surface_port.h"
 
 using namespace PBD;
 using namespace Mackie;
diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc
index fd9f4299d0..eba24e58f8 100644
--- a/libs/surfaces/mackie/strip.cc
+++ b/libs/surfaces/mackie/strip.cc
@@ -36,6 +36,7 @@
 #include "ardour/meter.h"
 
 #include "mackie_control_protocol.h"
+#include "surface_port.h"
 #include "surface.h"
 #include "button.h"
 #include "led.h"