diff --git a/dssi-vst-scanner.cpp b/dssi-vst-scanner.cpp
index 37ee5bb..00d5e54 100644
--- a/dssi-vst-scanner.cpp
+++ b/dssi-vst-scanner.cpp
@@ -21,7 +21,6 @@
 #include <windows.h>
 
 #include "aeffectx.h"
-#include "AEffEditor.hpp"
 
 #include "remotepluginserver.h"
 #include "paths.h"
diff --git a/dssi-vst-server.cpp b/dssi-vst-server.cpp
index 25342b3..4e7b64b 100644
--- a/dssi-vst-server.cpp
+++ b/dssi-vst-server.cpp
@@ -19,7 +19,6 @@
 #include <windows.h>
 
 #include "aeffectx.h"
-#include "AEffEditor.hpp"
 
 #include "remotepluginserver.h"
 
@@ -28,6 +27,13 @@
 #define APPLICATION_CLASS_NAME "dssi_vst"
 #define PLUGIN_ENTRY_POINT "main"
 
+struct Rect {
+    short top;
+    short left;
+    short bottom;
+    short right;
+};
+
 static bool inProcessThread = false;
 static bool exiting = false;
 static HWND hWnd = 0;
@@ -690,7 +696,7 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow)
     }
 
     plugin->dispatcher(plugin, effEditOpen, 0, 0, hWnd, 0);
-    ERect *rect = 0;
+    Rect *rect = 0;
     plugin->dispatcher(plugin, effEditGetRect, 0, 0, &rect, 0);
     if (!rect) {
 	cerr << "dssi-vst-server: ERROR: Plugin failed to report window size\n" << endl;
diff --git a/dssi-vst_gui.cpp b/dssi-vst_gui.cpp
index a92002e..6ab9a79 100644
--- a/dssi-vst_gui.cpp
+++ b/dssi-vst_gui.cpp
@@ -23,13 +23,19 @@
 #include <windows.h>
 
 #include "aeffectx.h"
-#include "AEffEditor.hpp"
 
 #include "paths.h"
 
 #define APPLICATION_CLASS_NAME "dssi_vst"
 #define PLUGIN_ENTRY_POINT "main"
 
+struct Rect {
+    short top;
+    short left;
+    short bottom;
+    short right;
+};
+
 static bool exiting = false;
 static HWND hWnd = 0;
 static double currentSamplePosition = 0.0;
@@ -528,7 +534,7 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow)
     }
 
     plugin->dispatcher(plugin, effEditOpen, 0, 0, hWnd, 0);
-    ERect *rect = 0;
+    Rect *rect = 0;
     plugin->dispatcher(plugin, effEditGetRect, 0, 0, &rect, 0);
     if (!rect) {
 	cerr << "dssi-vst_gui: ERROR: Plugin failed to report window size\n" << endl;