diff --git a/plugins/onepad/CMakeLists.txt b/plugins/onepad/CMakeLists.txt
index af91c3cf11..164db44a23 100644
--- a/plugins/onepad/CMakeLists.txt
+++ b/plugins/onepad/CMakeLists.txt
@@ -9,7 +9,8 @@ set(compiled_images "${CMAKE_BINARY_DIR}/plugins/onepad/ImgHeader")
 set(image_sources "${CMAKE_SOURCE_DIR}/plugins/onepad/Img")
 set(linux_sources "Linux")
 set(linux_headers "Linux")
-
+set(wx_sources "wx_dialog")
+set(wx_headers "wx_dialog")
 
 set(onepadGuiResources
     ${compiled_images}/analog.h
@@ -64,20 +65,26 @@ set(onepadHeaders
     resources.h
     state_management.h)
 
+# onepad wx sources
+set(onepadwxSources
+    ${wx_sources}/dialog.cpp
+    ${wx_sources}/opPanel.cpp
+    ${wx_sources}/GamepadConfiguration.cpp
+    ${wx_headers}/JoystickConfiguration.cpp)
+
+# onepad wx headers
+set(onepadwxHeaders
+    ${wx_headers}/opPanel.h
+    ${wx_headers}/GamepadConfiguration.h
+    ${wx_headers}/JoystickConfiguration.h)
+    
 # onepad Linux sources
 set(onepadLinuxSources
     ${linux_sources}/ini.cpp
-    ${linux_sources}/dialog.cpp
-    ${linux_sources}/linux.cpp
-    ${linux_sources}/opPanel.cpp
-    ${linux_sources}/GamepadConfiguration.cpp
-    ${linux_headers}/JoystickConfiguration.cpp)
+    ${linux_sources}/linux.cpp)
 
 # onepad Linux headers
-set(onepadLinuxHeaders
-    ${linux_headers}/opPanel.h
-    ${linux_headers}/GamepadConfiguration.h
-    ${linux_headers}/JoystickConfiguration.h)
+set(onepadLinuxHeaders)
 
 # onepad Windows sources
 set(onepadWindowsSources)
@@ -98,6 +105,8 @@ set(onepadFinalLibs
 set(onepadFinalSources
     ${onepadSources}
     ${onepadHeaders}
+    ${onepadwxSources}
+    ${onepadwxHeaders}
     ${onepadLinuxSources}
     ${onepadLinuxHeaders}
     ${onepadGuiResources}
diff --git a/plugins/onepad/Linux/linux.cpp b/plugins/onepad/Linux/linux.cpp
index 2ec910fabb..685b7d212c 100644
--- a/plugins/onepad/Linux/linux.cpp
+++ b/plugins/onepad/Linux/linux.cpp
@@ -26,7 +26,7 @@
 
 #include <string.h>
 #include <gtk/gtk.h>
-#include "dialog.h"
+#include "wx_dialog/dialog.h"
 
 Display *GSdsp;
 Window GSwin;
diff --git a/plugins/onepad/Linux/GamepadConfiguration.cpp b/plugins/onepad/wx_dialog/GamepadConfiguration.cpp
similarity index 100%
rename from plugins/onepad/Linux/GamepadConfiguration.cpp
rename to plugins/onepad/wx_dialog/GamepadConfiguration.cpp
diff --git a/plugins/onepad/Linux/GamepadConfiguration.h b/plugins/onepad/wx_dialog/GamepadConfiguration.h
similarity index 100%
rename from plugins/onepad/Linux/GamepadConfiguration.h
rename to plugins/onepad/wx_dialog/GamepadConfiguration.h
diff --git a/plugins/onepad/Linux/JoystickConfiguration.cpp b/plugins/onepad/wx_dialog/JoystickConfiguration.cpp
similarity index 100%
rename from plugins/onepad/Linux/JoystickConfiguration.cpp
rename to plugins/onepad/wx_dialog/JoystickConfiguration.cpp
diff --git a/plugins/onepad/Linux/JoystickConfiguration.h b/plugins/onepad/wx_dialog/JoystickConfiguration.h
similarity index 100%
rename from plugins/onepad/Linux/JoystickConfiguration.h
rename to plugins/onepad/wx_dialog/JoystickConfiguration.h
diff --git a/plugins/onepad/Linux/dialog.cpp b/plugins/onepad/wx_dialog/dialog.cpp
similarity index 100%
rename from plugins/onepad/Linux/dialog.cpp
rename to plugins/onepad/wx_dialog/dialog.cpp
diff --git a/plugins/onepad/Linux/dialog.h b/plugins/onepad/wx_dialog/dialog.h
similarity index 100%
rename from plugins/onepad/Linux/dialog.h
rename to plugins/onepad/wx_dialog/dialog.h
diff --git a/plugins/onepad/Linux/opPanel.cpp b/plugins/onepad/wx_dialog/opPanel.cpp
similarity index 100%
rename from plugins/onepad/Linux/opPanel.cpp
rename to plugins/onepad/wx_dialog/opPanel.cpp
diff --git a/plugins/onepad/Linux/opPanel.h b/plugins/onepad/wx_dialog/opPanel.h
similarity index 100%
rename from plugins/onepad/Linux/opPanel.h
rename to plugins/onepad/wx_dialog/opPanel.h