diff --git a/rbutil/rbutilqt/uninstall.cpp b/rbutil/rbutilqt/base/uninstall.cpp
similarity index 99%
rename from rbutil/rbutilqt/uninstall.cpp
rename to rbutil/rbutilqt/base/uninstall.cpp
index fda802f445..ae5ece7da5 100644
--- a/rbutil/rbutilqt/uninstall.cpp
+++ b/rbutil/rbutilqt/base/uninstall.cpp
@@ -17,6 +17,7 @@
  *
  ****************************************************************************/
 
+#include <QtCore>
 #include "uninstall.h"
 #include "utils.h"
 
@@ -125,3 +126,4 @@ bool Uninstaller::uninstallPossible()
 {
     return QFileInfo(m_mountpoint +"/.rockbox/rbutil.log").exists();
 }
+
diff --git a/rbutil/rbutilqt/uninstall.h b/rbutil/rbutilqt/base/uninstall.h
similarity index 98%
rename from rbutil/rbutilqt/uninstall.h
rename to rbutil/rbutilqt/base/uninstall.h
index 047eb2a154..34faf9a4d7 100644
--- a/rbutil/rbutilqt/uninstall.h
+++ b/rbutil/rbutilqt/base/uninstall.h
@@ -23,10 +23,7 @@
 #ifndef UNINSTALL_H
 #define UNINSTALL_H
 
-
-
-#include <QtGui>
-
+#include <QtCore>
 
 #include "progressloggerinterface.h"
 
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index 759f834ce4..9fc74da25a 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -59,7 +59,7 @@ SOURCES += rbutilqt.cpp \
  ../sansapatcher/sansapatcher.c \
  browsedirtree.cpp \
  installthemes.cpp \
- uninstall.cpp \
+ base/uninstall.cpp \
  uninstallwindow.cpp \
  base/utils.cpp \
  preview.cpp \
@@ -111,7 +111,7 @@ HEADERS += rbutilqt.h \
  irivertools/h300sums.h \
  browsedirtree.h \
  installthemes.h \
- uninstall.h \
+ base/uninstall.h \
  uninstallwindow.h \
  base/utils.h \
  preview.h \