diff --git a/kdecore/kdebug.areas b/kdecore/kdebug.areas
index 78126503..e852664f 100644
--- a/kdecore/kdebug.areas
+++ b/kdecore/kdebug.areas
@@ -87,7 +87,6 @@
 1212        kwin
 1215        ksysguard
 1216        kwin (client errors)
-1217        khotkeys
 1218        ksmserver
 1219        kglobalaccel
 1220        kio_remote
diff --git a/kdecore/tests/kautostarttest.cpp b/kdecore/tests/kautostarttest.cpp
index c1e3ae87..5fbf0d61 100644
--- a/kdecore/tests/kautostarttest.cpp
+++ b/kdecore/tests/kautostarttest.cpp
@@ -17,28 +17,23 @@
 */
 
 #include "kautostarttest.h"
-
 #include "kstandarddirs.h"
-#include <kdebug.h>
-
-#include <qtest_kde.h>
+#include "kdebug.h"
+#include "kautostart.h"
+#include "qtest_kde.h"
 
 #include "moc_kautostarttest.cpp"
 
-#include <QtCore/QFile>
+#include <QFile>
 
 QTEST_KDEMAIN_CORE( KAutostartTest )
 
-#include <kautostart.h>
-
 void KAutostartTest::testStartDetection_data()
 {
     QTest::addColumn<QString>("service");
     QTest::addColumn<bool>("doesAutostart");
     if ( KAutostart::isServiceRegistered("plasma-desktop") )
         QTest::newRow("plasma-desktop") << "plasma-desktop" << true;
-    if ( KAutostart::isServiceRegistered("khotkeys") )
-        QTest::newRow("khotkeys") << "khotkeys" << false;
     QTest::newRow("does not exist") << "doesnotexist" << false;
 }
 
@@ -80,8 +75,6 @@ void KAutostartTest::testStartphase_data()
         QTest::newRow("plasma-desktop") << "plasma-desktop" << (int)KAutostart::BaseDesktop;
     if ( KAutostart::isServiceRegistered("klipper") )
         QTest::newRow("klipper") << "klipper" << (int)KAutostart::Applications;
-    if ( KAutostart::isServiceRegistered("khotkeys") )
-        QTest::newRow("khotkeys") << "ktip" << (int)KAutostart::Applications;
     QTest::newRow("does not exist") << "doesnotexist"
                                     << (int)KAutostart::Applications;
 }