diff --git a/meson.build b/meson.build
index 74b30398..2629d9a6 100644
--- a/meson.build
+++ b/meson.build
@@ -32,6 +32,7 @@ bitsery_dep = subproject('bitsery').get_variable('bitsery_dep')
 threads_dep = dependency('threads')
 # The built in threads dependency does not know how to handle winegcc
 wine_threads_dep = declare_dependency(link_args : '-lpthread')
+x11_dep = dependency('x11')
 
 include_dir = include_directories('src/include')
 
@@ -57,11 +58,11 @@ executable(
     'src/common/serialization.cpp',
     'src/wine-host/plugin-bridge.cpp',
     'src/wine-host/vst-host.cpp',
-    'src/wine-host/win32-editor.cpp',
+    'src/wine-host/editor.cpp',
   ],
   native : false,
   include_directories : include_dir,
-  dependencies : [boost_dep, bitsery_dep, wine_threads_dep],
+  dependencies : [boost_dep, bitsery_dep, wine_threads_dep, x11_dep],
   cpp_args : compiler_options,
   link_args : []
 )
diff --git a/src/wine-host/win32-editor.cpp b/src/wine-host/editor.cpp
similarity index 98%
rename from src/wine-host/win32-editor.cpp
rename to src/wine-host/editor.cpp
index 35520668..5d23ca51 100644
--- a/src/wine-host/win32-editor.cpp
+++ b/src/wine-host/editor.cpp
@@ -1,4 +1,4 @@
-#include "win32-editor.h"
+#include "editor.h"
 
 ATOM register_window_class(std::string window_class_name);
 
diff --git a/src/wine-host/win32-editor.h b/src/wine-host/editor.h
similarity index 100%
rename from src/wine-host/win32-editor.h
rename to src/wine-host/editor.h
diff --git a/src/wine-host/plugin-bridge.h b/src/wine-host/plugin-bridge.h
index ee219fe9..0c9ba56a 100644
--- a/src/wine-host/plugin-bridge.h
+++ b/src/wine-host/plugin-bridge.h
@@ -31,7 +31,7 @@
 #include <thread>
 
 #include "../common/logging.h"
-#include "win32-editor.h"
+#include "editor.h"
 
 /**
  * This handles the communication between the Linux native VST plugin and the