diff --git a/src/core/core.pri b/src/core/core.pri
index 19707a885..8e02c50c2 100644
--- a/src/core/core.pri
+++ b/src/core/core.pri
@@ -1,7 +1,5 @@
 INCLUDEPATH += $$PWD
 
-unix:!macx:dbus: include(qtnotify/qtnotify.pri)
-
 include(qtlibtorrent/qtlibtorrent.pri)
 
 HEADERS += \
diff --git a/src/core/qtlibtorrent/qtlibtorrent.pri b/src/core/qtlibtorrent/qtlibtorrent.pri
index 25acd8f73..83cffd84b 100644
--- a/src/core/qtlibtorrent/qtlibtorrent.pri
+++ b/src/core/qtlibtorrent/qtlibtorrent.pri
@@ -15,11 +15,3 @@ SOURCES += $$PWD/qbtsession.cpp \
            $$PWD/alertdispatcher.cpp \
            $$PWD/torrentstatistics.cpp \
            $$PWD/filterparserthread.cpp
-
-!contains(DEFINES, DISABLE_GUI) {
-  HEADERS += $$PWD/torrentmodel.h \
-             $$PWD/shutdownconfirm.h
-
-  SOURCES += $$PWD/torrentmodel.cpp \
-             $$PWD/shutdownconfirm.cpp
-}
diff --git a/src/gui/gui.pri b/src/gui/gui.pri
index cc9afe1a6..3ba11cd54 100644
--- a/src/gui/gui.pri
+++ b/src/gui/gui.pri
@@ -6,6 +6,7 @@ include(rss/rss.pri)
 include(torrentcreator/torrentcreator.pri)
 include(geoip/geoip.pri)
 include(powermanagement/powermanagement.pri)
+unix:!macx:dbus: include(qtnotify/qtnotify.pri)
 
 HEADERS += \
     $$PWD/mainwindow.h \
@@ -41,7 +42,9 @@ HEADERS += \
     $$PWD/messageboxraised.h \
     $$PWD/torrentfilterenum.h \
     $$PWD/options_imp.h \
-    $$PWD/advancedsettings.h
+    $$PWD/advancedsettings.h \
+    $$PWD/shutdownconfirm.h \
+    $$PWD/torrentmodel.h
 
 SOURCES += \
     $$PWD/mainwindow.cpp \
@@ -69,7 +72,9 @@ SOURCES += \
     $$PWD/messageboxraised.cpp \
     $$PWD/statusbar.cpp \
     $$PWD/trackerlogin.cpp \
-    $$PWD/options_imp.cpp
+    $$PWD/options_imp.cpp \
+    $$PWD/shutdownconfirm.cpp \
+    $$PWD/torrentmodel.cpp
 
 win32|macx {
     HEADERS += $$PWD/programupdater.h
diff --git a/src/core/qtnotify/notifications.cpp b/src/gui/qtnotify/notifications.cpp
similarity index 100%
rename from src/core/qtnotify/notifications.cpp
rename to src/gui/qtnotify/notifications.cpp
diff --git a/src/core/qtnotify/notifications.h b/src/gui/qtnotify/notifications.h
similarity index 100%
rename from src/core/qtnotify/notifications.h
rename to src/gui/qtnotify/notifications.h
diff --git a/src/core/qtnotify/notifications.xml b/src/gui/qtnotify/notifications.xml
similarity index 100%
rename from src/core/qtnotify/notifications.xml
rename to src/gui/qtnotify/notifications.xml
diff --git a/src/core/qtnotify/qtnotify.pri b/src/gui/qtnotify/qtnotify.pri
similarity index 100%
rename from src/core/qtnotify/qtnotify.pri
rename to src/gui/qtnotify/qtnotify.pri
diff --git a/src/core/qtlibtorrent/shutdownconfirm.cpp b/src/gui/shutdownconfirm.cpp
similarity index 100%
rename from src/core/qtlibtorrent/shutdownconfirm.cpp
rename to src/gui/shutdownconfirm.cpp
diff --git a/src/core/qtlibtorrent/shutdownconfirm.h b/src/gui/shutdownconfirm.h
similarity index 100%
rename from src/core/qtlibtorrent/shutdownconfirm.h
rename to src/gui/shutdownconfirm.h
diff --git a/src/core/qtlibtorrent/torrentmodel.cpp b/src/gui/torrentmodel.cpp
similarity index 100%
rename from src/core/qtlibtorrent/torrentmodel.cpp
rename to src/gui/torrentmodel.cpp
diff --git a/src/core/qtlibtorrent/torrentmodel.h b/src/gui/torrentmodel.h
similarity index 100%
rename from src/core/qtlibtorrent/torrentmodel.h
rename to src/gui/torrentmodel.h