diff --git a/include/SignalSender.h b/include/SignalSender.h
index e0a93e69474..dcd4575dfc8 100644
--- a/include/SignalSender.h
+++ b/include/SignalSender.h
@@ -3,6 +3,7 @@
 
 #include <QObject>
 #include "SubWindow.h"
+#include <include/SubWindow.h>
 
 class SignalSender : public QObject
 {
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 5477e2dd2f4..cd272c751b2 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -33,7 +33,6 @@ SET(LMMS_SRCS
 	gui/PluginBrowser.cpp
 	gui/ProjectNotes.cpp
 	gui/RowTableView.cpp
-	gui/SetupDialog.cpp
 	gui/SignalSender.cpp
 	gui/SampleTrackWindow.cpp
 	gui/SendButtonIndicator.cpp
diff --git a/src/gui/SignalSender.cpp b/src/gui/SignalSender.cpp
index 792e60f5a50..c97e2f6bbaf 100644
--- a/src/gui/SignalSender.cpp
+++ b/src/gui/SignalSender.cpp
@@ -1,4 +1,6 @@
 #include "SignalSender.h"
+#include "SubWindow.h"
+#include <include/SubWindow.h>
 
 SignalSender* SignalSender::getInstance()
 {