diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 9fb367dfc9..daf163eb08 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -22,13 +22,13 @@
 #include <gtkmm/alignment.h>
 #include "gtkmm2ext/utils.h"
 
-#include "ardour/types.h"
-#include "pbd/configuration.h"
-
-#include "ardour/rc_configuration.h"
-#include "ardour/utils.h"
 #include "ardour/dB.h"
+#include "ardour/rc_configuration.h"
 #include "ardour/session.h"
+#include "ardour/types.h"
+#include "ardour/utils.h"
+
+#include "pbd/configuration.h"
 
 #include "public_editor.h"
 #include "option_editor.h"
diff --git a/libs/ardour/ardour/rc_configuration.h b/libs/ardour/ardour/rc_configuration.h
index 9f62edd4fb..4f1bac303a 100644
--- a/libs/ardour/ardour/rc_configuration.h
+++ b/libs/ardour/ardour/rc_configuration.h
@@ -23,12 +23,12 @@
 #include <map>
 #include <string>
 
-#include "ardour/types.h"
-#include "pbd/configuration.h"
-
 #include "ardour/libardour_visibility.h"
+#include "ardour/types.h"
 #include "ardour/utils.h"
 
+#include "pbd/configuration.h"
+
 class XMLNode;
 
 namespace ARDOUR {