diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index dc26e49d82..d18f81b2c4 100644
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -48,6 +48,7 @@
 #include "ardour/ladspa_plugin.h"
 #ifdef VST_SUPPORT
 #include "ardour/vst_plugin.h"
+#include "vst_pluginui.h"
 #endif
 #ifdef HAVE_SLV2
 #include "ardour/lv2_plugin.h"
diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index 9fe2ab4921..99a4ce36e8 100644
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -292,32 +292,6 @@ class PluginUIWindow : public Gtk::Window
 	bool create_lv2_editor (boost::shared_ptr<ARDOUR::PluginInsert>);
 };
 
-#ifdef VST_SUPPORT
-class VSTPluginUI : public PlugUIBase, public Gtk::VBox
-{
-  public:
-	VSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>, boost::shared_ptr<ARDOUR::VSTPlugin>);
-	~VSTPluginUI ();
-
-	gint get_preferred_height ();
-	gint get_preferred_width ();
-	bool start_updating(GdkEventAny*) {return false;}
-	bool stop_updating(GdkEventAny*) {return false;}
-
-	int package (Gtk::Window&);
-
-  private:
-	boost::shared_ptr<ARDOUR::VSTPlugin> vst;
-	Gtk::Socket socket;
-	Gtk::HBox   preset_box;
-	Gtk::VBox   vpacker;
-
-	bool configure_handler (GdkEventConfigure*, Gtk::Socket*);
-	void save_plugin_setting ();
-	void setting_selected ();
-};
-#endif // VST_SUPPORT
-
 #ifdef AUDIOUNITS
 /* this function has to be in a .mm file */
 extern PlugUIBase* create_au_gui (boost::shared_ptr<ARDOUR::PluginInsert>, Gtk::VBox**);
diff --git a/gtk2_ardour/vst_pluginui.cc b/gtk2_ardour/vst_pluginui.cc
index 8de5ebe63b..be8a619e70 100644
--- a/gtk2_ardour/vst_pluginui.cc
+++ b/gtk2_ardour/vst_pluginui.cc
@@ -23,7 +23,7 @@
 #include "ardour/plugin_insert.h"
 #include "ardour/vst_plugin.h"
 
-#include "plugin_ui.h"
+#include "vst_pluginui.h"
 
 #include <gdk/gdkx.h>
 
diff --git a/gtk2_ardour/vst_pluginui.h b/gtk2_ardour/vst_pluginui.h
new file mode 100644
index 0000000000..71452617f8
--- /dev/null
+++ b/gtk2_ardour/vst_pluginui.h
@@ -0,0 +1,44 @@
+/*
+    Copyright (C) 2000-2006 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "plugin_ui.h"
+
+class VSTPluginUI : public PlugUIBase, public Gtk::VBox
+{
+  public:
+	VSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>, boost::shared_ptr<ARDOUR::VSTPlugin>);
+	~VSTPluginUI ();
+
+	gint get_preferred_height ();
+	gint get_preferred_width ();
+	bool start_updating(GdkEventAny*) {return false;}
+	bool stop_updating(GdkEventAny*) {return false;}
+
+	int package (Gtk::Window&);
+
+  private:
+	boost::shared_ptr<ARDOUR::VSTPlugin> vst;
+	Gtk::Socket socket;
+	Gtk::HBox   preset_box;
+	Gtk::VBox   vpacker;
+
+	bool configure_handler (GdkEventConfigure*, Gtk::Socket*);
+	void save_plugin_setting ();
+	void setting_selected ();
+};