try some rearrangement to fix old mingw builds

libs/surfaces/mackie/mackie_control_protocol.cc

@@ -73,7 +73,6 @@
 #include "mackie_control_exception.h"
 #include "device_profile.h"
 #include "subview.h"
-#include "subview_modes.h"
 #include "surface_port.h"
 #include "surface.h"
 #include "strip.h"

libs/surfaces/mackie/mackie_control_protocol.h

@@ -46,7 +46,7 @@
 #include "timer.h"
 #include "device_info.h"
 #include "device_profile.h"
-#include "subview_modes.h"
+#include "subview.h"
 
 namespace ARDOUR {
 	class AutomationControl;
@@ -60,7 +60,6 @@ namespace MIDI {
 namespace ArdourSurface {
 
 namespace Mackie {
-	class Subview;
 	class Surface;
 	class Control;
 	class SurfacePort;

libs/surfaces/mackie/strip.cc

@@ -60,7 +60,6 @@
 
 #include "mackie_control_protocol.h"
 #include "subview.h"
-#include "subview_modes.h"
 #include "surface_port.h"
 #include "surface.h"
 #include "strip.h"

libs/surfaces/mackie/subview.cc

@@ -40,7 +40,6 @@
 #include "pot.h"
 #include "strip.h"
 #include "subview.h"
-#include "subview_modes.h"
 #include "surface.h"
 
 using namespace ARDOUR;

libs/surfaces/mackie/subview.h

@@ -24,7 +24,11 @@
 
 #include "ardour/types.h"
 
-#include "subview_modes.h"
+namespace ARDOUR {
+	class ParameterDescriptor;
+	class Plugin;
+	class PluginInsert;
+}
 
 namespace ArdourSurface {
 
@@ -37,6 +41,15 @@ class Strip;
 class Subview;
 class Surface;
 
+enum SubViewMode {
+	None,
+	EQ,
+	Dynamics,
+	Sends,
+	TrackView,
+	Plugin,
+};
+
 class SubviewFactory {
   public:
 	static SubviewFactory* instance();