diff --git a/src/ui/dbusidlehandler.cc b/src/ui/dbusidlehandler.cc
deleted file mode 100644
index 400427e49..000000000
--- a/src/ui/dbusidlehandler.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-/* This file is part of Clementine.
-   Copyright 2010, David Sansome <me@davidsansome.com>
-   Copyright 2015, Arun Narayanankutty <n.arun.lifescience@gmail.com>
-
-   Clementine is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Clementine is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace {
-  
-  // Gnome screensaver 
-  const char* kGnomeScreensaverService
-      = "org.gnome.ScreenSaver";
-  const char* kGnomeScreensaverPath
-      = "/";
-  const char* kGnomeScreensaverInterface
-      = "org.gnome.ScreenSaver";
-
-  // Freedesktop screensaver
-  const char* kFreedesktopScreensaverService
-      = "org.freedesktop.ScreenSaver";
-  const char* kFreedesktopScreensaverPath
-      = "/ScreenSaver";
-  const char* kFreedesktopScreensaverInterface
-      = "org.freedesktop.ScreenSaver";
-
-  // Gnome powermanager
-  const char* kGnomePowermanagerService
-      = "org.gnome.SessionManager";
-  const char* kGnomePowermanagerPath
-      = "/org/gnome/SessionManager";
-  const char* kGnomePowermanagerInterface
-      = "org.gnome.SessionManager";
-
-  // Freedesktop powermanager
-  const char* kFreedesktopPowermanagerService
-      = "org.freedesktop.PowerManagement";
-  const char* kFreedesktopPowermanagerPath
-      = "/org/freedesktop/PowerManagement/Inhibit";
-  const char* kFreedesktopPowermanagerInterface
-      = "org.freedesktop.PowerManagement.Inhibit";
-}
diff --git a/src/ui/dbusidlehandler.cpp b/src/ui/dbusidlehandler.cpp
index 080419ece..45412f1ac 100644
--- a/src/ui/dbusidlehandler.cpp
+++ b/src/ui/dbusidlehandler.cpp
@@ -34,7 +34,7 @@ void DBusIdleHandler::Inhibit(const char* reason) {
   QDBusInterface iface(service_, path_,
                        interface_, QDBusConnection::sessionBus());
   QDBusReply<quint32> reply;
-  if (service_ == "org.gnome.SessionManager") {
+  if (service_ == IdleHandler::kGnomePowermanagerService) {
     reply =
         iface.call("Inhibit", QCoreApplication::applicationName(), 
                      quint32(0), QObject::tr(reason),
@@ -57,7 +57,7 @@ void DBusIdleHandler::Inhibit(const char* reason) {
 void DBusIdleHandler::Uninhibit() {
   QDBusInterface iface(service_, path_,
                        interface_, QDBusConnection::sessionBus());
-  if (service_ == "org.gnome.SessionManager") {
+  if (service_ == IdleHandler::kGnomePowermanagerService) {
     iface.call("Uninhibit", cookie_);
   } else {
     iface.call("UnInhibit", cookie_);
@@ -68,7 +68,7 @@ bool DBusIdleHandler::Isinhibited() {
   QDBusInterface iface(service_, path_,
                        interface_, QDBusConnection::sessionBus());
   QDBusReply<bool> reply;
-  if (service_ == "org.gnome.SessionManager") {
+  if (service_ == IdleHandler::kGnomePowermanagerService) {
     reply = iface.call("IsInhibited", quint32(Inhibit_Suspend));
   } else {
     reply = iface.call("HasInhibit");
diff --git a/src/ui/idlehandler.cpp b/src/ui/idlehandler.cpp
index 35d8317e5..1672c043b 100644
--- a/src/ui/idlehandler.cpp
+++ b/src/ui/idlehandler.cpp
@@ -20,8 +20,6 @@
 #include "idlehandler.h"
 #include "core/logging.h"
 
-#include "dbusidlehandler.cc"
-
 #include <QtGlobal>
 
 #ifdef HAVE_DBUS
@@ -38,6 +36,42 @@
 #include "windowsidlehandler.h"
 #endif
 
+// Services
+const char* IdleHandler::kGnomeScreensaverService
+    = "org.gnome.ScreenSaver";
+const char* IdleHandler::kFreedesktopScreensaverService
+    = "org.freedesktop.ScreenSaver";
+const char* IdleHandler::kGnomePowermanagerService
+    = "org.gnome.SessionManager";
+const char* IdleHandler::kFreedesktopPowermanagerService
+    = "org.freedesktop.PowerManagement";
+
+namespace {
+  // Gnome Screensaver
+  const char* kGnomeScreensaverPath
+      = "/";
+  const char* kGnomeScreensaverInterface
+      = "org.gnome.ScreenSaver";
+  
+  // Freedesktop screensaver
+  const char* kFreedesktopScreensaverPath
+      = "/ScreenSaver";
+  const char* kFreedesktopScreensaverInterface
+      = "org.freedesktop.ScreenSaver";
+
+  // Gnome powermanager
+  const char* kGnomePowermanagerPath
+      = "/org/gnome/SessionManager";
+  const char* kGnomePowermanagerInterface
+      = "org.gnome.SessionManager";
+
+  // Freedesktop powermanager
+  const char* kFreedesktopPowermanagerPath
+      = "/org/freedesktop/PowerManagement/Inhibit";
+  const char* kFreedesktopPowermanagerInterface
+      = "org.freedesktop.PowerManagement.Inhibit";
+}
+
 IdleHandler* IdleHandler::screensaver_ = 0;
 IdleHandler* IdleHandler::suspend_ = 0;
 
diff --git a/src/ui/idlehandler.h b/src/ui/idlehandler.h
index 77442d9e9..8aaf18999 100644
--- a/src/ui/idlehandler.h
+++ b/src/ui/idlehandler.h
@@ -37,6 +37,11 @@ class IdleHandler {
   };
   static Inhibitor inbtr_;
 
+  static const char* kGnomeScreensaverService;
+  static const char* kFreedesktopScreensaverService;
+  static const char* kGnomePowermanagerService;
+  static const char* kFreedesktopPowermanagerService;
+
  private:
   static IdleHandler* screensaver_;
   static IdleHandler* suspend_;