diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt
index 7333ec01..bf7d5978 100644
--- a/includes/CMakeLists.txt
+++ b/includes/CMakeLists.txt
@@ -81,7 +81,6 @@ install(
     KDEPrintDialog
     KCalendarWidget
     KDateTime
-    KDateValidator
     KDBusMenuExporter
     KDBusMenuImporter
     KDesktopFile
@@ -210,7 +209,6 @@ install(
     KPluginInfo
     KPluginLoader
     KPluginSelector
-    KPopupFrame
     KPowerManager
     KPreviewWidgetBase
     KProcess
@@ -458,7 +456,6 @@ install(
     Solid/Device
     Solid/DeviceInterface
     Solid/DeviceNotifier
-    Solid/GenericInterface
     Solid/NetworkInterface
     Solid/OpticalDisc
     Solid/OpticalDrive
diff --git a/includes/KDateValidator b/includes/KDateValidator
deleted file mode 100644
index 08c83154..00000000
--- a/includes/KDateValidator
+++ /dev/null
@@ -1 +0,0 @@
-#include "../kdatetable.h"
diff --git a/includes/KPopupFrame b/includes/KPopupFrame
deleted file mode 100644
index 08c83154..00000000
--- a/includes/KPopupFrame
+++ /dev/null
@@ -1 +0,0 @@
-#include "../kdatetable.h"
diff --git a/includes/Solid/GenericInterface b/includes/Solid/GenericInterface
deleted file mode 100644
index a45a55e9..00000000
--- a/includes/Solid/GenericInterface
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../solid/genericinterface.h"
diff --git a/includes/checkobsolete.py b/includes/checkobsolete.py
index 09b9ba02..0d2fd4e1 100755
--- a/includes/checkobsolete.py
+++ b/includes/checkobsolete.py
@@ -22,7 +22,7 @@ for root, dirs, files in os.walk(os.getcwd()):
         sfull = '%s/%s' % (root, sfile)
         with open(sfull, 'rb') as f:
             content = f.read()
-        for smatch in oregex.findall(content):
+        for smatch in oregex.findall(str(content)):
             if smatch in lexceptions:
                 continue
             if not os.path.basename(smatch) in lall: