diff --git a/mythtv/libs/libmyth/generictree.cpp b/mythtv/libs/libmyth/generictree.cpp
diff --git a/mythtv/libs/libmyth/generictree.h b/mythtv/libs/libmyth/generictree.h
diff --git a/mythtv/libs/libmyth/libmyth.pro b/mythtv/libs/libmyth/libmyth.pro
@@ -18,7 +18,7 @@ HEADERS += audio/audiooutpututil.h audio/audiooutputdownmix.h
 HEADERS += audio/audiooutputdigitalencoder.h audio/spdifencoder.h
 HEADERS += audio/audiosettings.h audio/audiooutputsettings.h audio/pink.h
 HEADERS += backendselect.h dbsettings.h dialogbox.h
-HEADERS += generictree.h langsettings.h
+HEADERS += langsettings.h
 HEADERS += mythconfigdialogs.h mythconfiggroups.h
 HEADERS += mythcontext.h mythdialogs.h
 HEADERS += mythevent.h mythexp.h mythmediamonitor.h
@@ -44,10 +44,10 @@ SOURCES += audio/spdifencoder.cpp audio/audiooutputdigitalencoder.cpp
 SOURCES += audio/audiooutputnull.cpp
 SOURCES += audio/audiooutpututil.cpp audio/audiooutputdownmix.cpp
 SOURCES += audio/audiosettings.cpp audio/audiooutputsettings.cpp audio/pink.c
-SOURCES += volumebase.cpp 
+SOURCES += volumebase.cpp
 
 SOURCES += backendselect.cpp dbsettings.cpp dialogbox.cpp
-SOURCES += generictree.cpp langsettings.cpp
+SOURCES += langsettings.cpp
 SOURCES += mythconfigdialogs.cpp mythconfiggroups.cpp
 SOURCES += mythcontext.cpp mythdialogs.cpp
 SOURCES += mythmediamonitor.cpp
@@ -103,7 +103,7 @@ inc.files += settings.h uitypes.h  mythplugin.h mythdialogs.h
 inc.files += audio/audiooutput.h audio/audiosettings.h
 inc.files += audio/audiooutputsettings.h
 inc.files += inetcomms.h mythwizard.h schemawizard.h
-inc.files += generictree.h mythmediamonitor.h
+inc.files += mythmediamonitor.h
 inc.files += visual.h volumebase.h output.h langsettings.h
 inc.files += mythexp.h mythpluginapi.h storagegroupeditor.h
 inc.files += mythconfigdialogs.h mythconfiggroups.h
@@ -114,7 +114,7 @@ inc.files += mythrssmanager.h     netgrabbermanager.h
 inc.files += rssparse.h           netutils.h
 
 # remove when everything is switched to mythui
-inc.files += virtualkeyboard_qt.h xmlparse.h 
+inc.files += virtualkeyboard_qt.h xmlparse.h
 
 # Allow both #include <blah.h> and #include <libmyth/blah.h>
 inc2.path  = $${PREFIX}/include/mythtv/libmyth

diff --git a/mythtv/libs/libmyth/mythdialogs.h b/mythtv/libs/libmyth/mythdialogs.h
@@ -15,7 +15,6 @@
 #include <vector>
 using namespace std;
 
-class GenericTree;
 class MythMediaDevice;
 class MythLineEdit;
 class MythRemoteLineEdit;

diff --git a/mythtv/libs/libmyth/uitypes.h b/mythtv/libs/libmyth/uitypes.h
@@ -18,7 +18,6 @@ using namespace std;
 #include "mythwidgets.h"
 #include "util.h"
 #include "mythdialogs.h"
-#include "generictree.h"
 #include "mythwidgets.h"
 #include "mythfontproperties.h"
 

diff --git a/mythtv/libs/libmythbase/mythversion.h b/mythtv/libs/libmythbase/mythversion.h
@@ -12,7 +12,7 @@
 /// Update this whenever the plug-in API changes.
 /// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
 /// libmythui class methods used by plug-ins.
-#define MYTH_BINARY_VERSION "0.25.20120122-1"
+#define MYTH_BINARY_VERSION "0.25.20120123-1"
 
 /** \brief Increment this whenever the MythTV network protocol changes.
  *