diff --git a/mythtv/libs/libmyth/uilistbtntype.cpp b/mythtv/libs/libmyth/uilistbtntype.cpp
diff --git a/mythtv/libs/libmyth/uilistbtntype.h b/mythtv/libs/libmyth/uilistbtntype.h
diff --git a/mythtv/libs/libmyth/uitypes.cpp b/mythtv/libs/libmyth/uitypes.cpp
diff --git a/mythtv/libs/libmyth/uitypes.h b/mythtv/libs/libmyth/uitypes.h
diff --git a/mythtv/libs/libmyth/virtualkeyboard_qt.h b/mythtv/libs/libmyth/virtualkeyboard_qt.h
@@ -2,8 +2,11 @@
 #define VIRTUALKEYBOARDQT_H_
 
 #include "mythdialogs.h"
+#include "mythexp.h"
+#include "mythmainwindow.h"
 
 class QKeyEvent;
+class UIKeyboardType;
 
 /// Preferred position to place virtual keyboard popup.
 enum PopupPositionQt 

diff --git a/mythtv/libs/libmyth/xmlparse.cpp b/mythtv/libs/libmyth/xmlparse.cpp
diff --git a/mythtv/libs/libmyth/xmlparse.h b/mythtv/libs/libmyth/xmlparse.h
@@ -4,6 +4,8 @@
 #include <QDomDocument>
 #include <QString>
 #include <QRect>
+//#include "mythexp.h"
+#include "uitypes.h"
 
 class MythUIHelper;
 
@@ -28,18 +30,6 @@ class MPUBLIC XMLParse
     QRect parseRect(QString);
     void parsePopup(QDomElement &);
     void parseContainer(QDomElement &, QString &, int &, QRect &);
-    void parseListArea(LayerSet *, QDomElement &);
-    bool parseDefaultCategoryColors(QMap<QString, QString> &catColors);
-    void parseManagedTreeList(LayerSet *, QDomElement &);
-    void parseTextArea(LayerSet *, QDomElement &);
-    void parseStatusBar(LayerSet *, QDomElement &);
-    void parseImage(LayerSet *, QDomElement &);
-    void parseRepeatedImage(LayerSet *, QDomElement &);
-    void parsePushButton(LayerSet *, QDomElement &);
-    void parseTextButton(LayerSet *, QDomElement &);
-    void parseBlackHole(LayerSet *, QDomElement &);
-    void parseListBtnArea(LayerSet *, QDomElement &);
-    void parseListTreeArea(LayerSet *, QDomElement &);
     void parseKeyboard(LayerSet *, QDomElement &);
     void parseKey(LayerSet *, QDomElement &);
 

diff --git a/mythtv/libs/libmythtv/recordingprofile.cpp b/mythtv/libs/libmythtv/recordingprofile.cpp
@@ -9,7 +9,6 @@
 #include "mythdb.h"
 #include "mythlogging.h"
 #include "mythwizard.h"
-#include "managedlist.h"
 
 QString RecordingProfileStorage::GetWhereClause(MSqlBindings &bindings) const
 {
@@ -1662,29 +1661,6 @@ QMap<int, QString> RecordingProfile::listProfiles(int group)
     return profiles;
 }
 
-void RecordingProfile::fillSelections(SelectManagedListItem *setting,
-                                      int group)
-{
-    QMap<int, QString> profiles = listProfiles(group);
-    if (!group)
-    {
-        QMap<int, QString>::iterator it;
-        for (it = profiles.begin(); it != profiles.end(); ++it)
-        {
-            QString lbl = QObject::tr("Record using the \"%1\" profile")
-                .arg(it.value());
-            setting->addSelection(lbl, it.value(), false);
-        }
-        return;
-    }
-
-    QMap<int, QString>::iterator it;
-    for (it = profiles.begin(); it != profiles.end(); ++it)
-    {
-        setting->addSelection(it.value(), QString::number(it.key()), false);
-    }
-}
-
 QString RecordingProfile::groupType(void) const
 {
     MSqlQuery result(MSqlQuery::InitCon());

diff --git a/mythtv/libs/libmythtv/recordingprofile.h b/mythtv/libs/libmythtv/recordingprofile.h
@@ -109,8 +109,6 @@ class MTV_PUBLIC RecordingProfile : public QObject, public ConfigurationWizard
     static QMap<int, QString> listProfiles(int group);
     static void fillSelections(SelectSetting* setting,
                                int group, bool foldautodetect = false);
-    static void fillSelections(SelectManagedListItem* setting,
-                               int group);
 
     // constants
     static const uint TranscoderAutodetect = 0; ///< sentinel value