diff --git a/plasma/applets/systemtray/CMakeLists.txt b/plasma/applets/systemtray/CMakeLists.txt
index a92b39de..faa09e19 100644
--- a/plasma/applets/systemtray/CMakeLists.txt
+++ b/plasma/applets/systemtray/CMakeLists.txt
@@ -2,8 +2,10 @@ project(plasma-systemtray)
 
 set(data_install_dir "plasma/packages/org.kde.systemtray")
 
-set(systemtray_SRCS
+cmake_policy(SET CMP0005 NEW)
+add_definitions(-DSYSTEMTRAY_DATA_INSTALL_DIR="${data_install_dir}")
 
+set(systemtray_SRCS
     core/manager.cpp
     core/protocol.cpp
     core/task.cpp
@@ -27,19 +29,8 @@ set(systemtray_SRCS
     ui/applet.cpp
     ui/widgetitem.cpp
     ui/mouseredirectarea.cpp
-
-    ui/autohide.ui
-    ui/visibleitems.ui
 )
 
-include(${QT_USE_FILE})
-include (CheckLibraryExists)
-check_library_exists (Xss XScreenSaverQueryInfo "" HAVE_LIBXSS)
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-IF (HAVE_LIBXSS)
-   SET (IDLE_DETECTION_LIB "Xss")
-ENDIF (HAVE_LIBXSS)
-
 kde4_add_plugin(plasma_applet_systemtray ${systemtray_SRCS})
 include_directories(${CMAKE_SOURCE_DIR})
 target_link_libraries(plasma_applet_systemtray
@@ -51,8 +42,6 @@ target_link_libraries(plasma_applet_systemtray
     ${X11_Xfixes_LIB}
     ${X11_Xdamage_LIB}
     ${X11_Xcomposite_LIB}
-    ${KDE4_SOLID_LIBS}
-    ${IDLE_DETECTION_LIB}
 )
 
 install(TARGETS plasma_applet_systemtray DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/plasma/applets/systemtray/config.h.in b/plasma/applets/systemtray/config.h.in
deleted file mode 100644
index 2b38ffb9..00000000
--- a/plasma/applets/systemtray/config.h.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#cmakedefine HAVE_LIBXSS
-
-// Path to directory containing qml stuff for systemtray
-#define SYSTEMTRAY_DATA_INSTALL_DIR "${data_install_dir}"
diff --git a/plasma/applets/systemtray/protocols/fdo/fdographicswidget.cpp b/plasma/applets/systemtray/protocols/fdo/fdographicswidget.cpp
index 9b7237ef..490baaa4 100644
--- a/plasma/applets/systemtray/protocols/fdo/fdographicswidget.cpp
+++ b/plasma/applets/systemtray/protocols/fdo/fdographicswidget.cpp
@@ -212,10 +212,11 @@ void FdoGraphicsWidget::handleClientError(QX11EmbedContainer::Error error)
 
 void FdoGraphicsWidget::resizeEvent(QGraphicsSceneResizeEvent *event)
 {
+    Q_UNUSED(event);
+
     if (d->widget) {
         d->widget.data()->resize(size().toSize());
     }
-    
 }
 
 }
diff --git a/plasma/applets/systemtray/ui/applet.cpp b/plasma/applets/systemtray/ui/applet.cpp
index 38aeba77..0141db48 100644
--- a/plasma/applets/systemtray/ui/applet.cpp
+++ b/plasma/applets/systemtray/ui/applet.cpp
@@ -52,8 +52,6 @@
 
 #include <inttypes.h>
 
-#include "config.h"
-
 #include "../core/manager.h"
 
 static const bool DEFAULT_SHOW_APPS = true;