diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
index 07f9cd84d9..147f2d9931 100644
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -23,19 +23,15 @@
 #ifndef __ardour_basic_ui_h__
 #define __ardour_basic_ui_h__
 
-#include <string>
-#include <stdint.h>
-
-#include "pbd/signals.h"
-
-#include "temporal/timeline.h"
-
-#include "ardour/types.h"
 #include "ardour/presentation_info.h"
-
+#include "ardour/types.h"
+#include "control_protocol/visibility.h"
+#include "temporal/timeline.h"
+#include "pbd/signals.h"
 #include "temporal/time.h"
 
-#include "control_protocol/visibility.h"
+#include <cstdint>
+#include <string>
 
 namespace ARDOUR {
 	class Session;
diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
index 9f0432f403..e191b8b57e 100644
--- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h
+++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
@@ -22,18 +22,17 @@
 #ifndef ardour_control_protocols_h
 #define ardour_control_protocols_h
 
-#include <list>
-#include <string>
-#include <vector>
-
-#include <boost/shared_ptr.hpp>
-
-#include "pbd/signals.h"
-#include "pbd/stateful.h"
-
 #include "control_protocol/basic_ui.h"
 #include "control_protocol/types.h"
 #include "control_protocol/visibility.h"
+#include "pbd/signals.h"
+#include "pbd/stateful.h"
+
+#include <boost/shared_ptr.hpp>
+
+#include <list>
+#include <string>
+#include <vector>
 
 namespace ARDOUR {
 
diff --git a/libs/surfaces/control_protocol/control_protocol/types.h b/libs/surfaces/control_protocol/control_protocol/types.h
index 4160363778..1a509dc5d3 100644
--- a/libs/surfaces/control_protocol/control_protocol/types.h
+++ b/libs/surfaces/control_protocol/control_protocol/types.h
@@ -19,9 +19,10 @@
 #ifndef __ardour_control_protocol_types_h__
 #define __ardour_control_protocol_types_h__
 
-#include <vector>
 #include <boost/smart_ptr.hpp>
 
+#include <vector>
+
 namespace ARDOUR {
 	class Route;
 	class Stripable;