diff --git a/mythtv/libs/libmyth/audio/audioconvert.cpp b/mythtv/libs/libmyth/audio/audioconvert.cpp
index f09b4bc2cf3..3517fa2d395 100644
--- a/mythtv/libs/libmyth/audio/audioconvert.cpp
+++ b/mythtv/libs/libmyth/audio/audioconvert.cpp
@@ -22,10 +22,9 @@
  */
 #include "audioconvert.h"
 
-#include <cstdint>
-#include <cmath>
-
 #include <algorithm>
+#include <cmath>
+#include <cstdint>
 
 // FFmpeg
 extern "C" {
@@ -35,7 +34,8 @@ extern "C" {
 
 #include <QtGlobal>
 
-#include "mythlogging.h"
+#include "libmythbase/mythlogging.h"
+
 #include "mythaverror.h"
 
 #define LOC QString("AudioConvert: ")
diff --git a/mythtv/libs/libmyth/audio/audiooutput.cpp b/mythtv/libs/libmyth/audio/audiooutput.cpp
index fcca2c91747..31e7b6a0853 100644
--- a/mythtv/libs/libmyth/audio/audiooutput.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutput.cpp
@@ -7,10 +7,10 @@
 #include <QDateTime>
 #include <QDir>
 
-#include "audiooutput.h"
-#include "mythmiscutil.h"
-#include "compat.h"
+#include "libmythbase/compat.h"
+#include "libmythbase/mythmiscutil.h"
 
+#include "audiooutput.h"
 #include "audiooutputnull.h"
 #ifdef _WIN32
 #include "audiooutputdx.h"
diff --git a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
index 15182ebe880..c5856d11c37 100644
--- a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
@@ -5,7 +5,7 @@
 #include <sys/time.h>
 
 #include <QFile>
-#include "mythcorecontext.h"
+#include "libmythbase/mythcorecontext.h"
 #include "audiooutputalsa.h"
 
 #define LOC QString("ALSA: ")
diff --git a/mythtv/libs/libmyth/audio/audiooutputaudiotrack.cpp b/mythtv/libs/libmyth/audio/audiooutputaudiotrack.cpp
index a0904203b67..4899bd1f872 100644
--- a/mythtv/libs/libmyth/audio/audiooutputaudiotrack.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputaudiotrack.cpp
@@ -2,7 +2,7 @@
 #include <QAndroidJniEnvironment>
 #include <android/log.h>
 
-#include "mythlogging.h"
+#include "libmythbase/mythlogging.h"
 #include "audiooutputaudiotrack.h"
 
 #define CHANNELS_MIN 1
diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
index 78fa8112a09..ee7f890e1e4 100644
--- a/mythtv/libs/libmyth/audio/audiooutputbase.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
@@ -2,6 +2,7 @@
 #include <algorithm>
 #include <cmath>
 #include <limits>
+#include <SoundTouch.h>
 
 // POSIX headers
 #include <unistd.h>
@@ -12,16 +13,16 @@
 #include <QMutexLocker>
 
 // MythTV headers
-#include "compat.h"
+#include "libmythbase/compat.h"
+#include "libmythbase/mythconfig.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythfreesurround/freesurround.h"
+
 #include "audiooutputbase.h"
 #include "audiooutputdigitalencoder.h"
-#include "audiooutpututil.h"
 #include "audiooutputdownmix.h"
-#include "SoundTouch.h"
-#include "freesurround.h"
+#include "audiooutpututil.h"
 #include "spdifencoder.h"
-#include "mythlogging.h"
-#include "mythconfig.h"
 
 // AC3 encode currently disabled for Android
 #if defined(Q_OS_ANDROID)
diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.h b/mythtv/libs/libmyth/audio/audiooutputbase.h
index 61bc3e07ecf..3efa0df76d1 100644
--- a/mythtv/libs/libmyth/audio/audiooutputbase.h
+++ b/mythtv/libs/libmyth/audio/audiooutputbase.h
@@ -10,10 +10,10 @@
 #include <QWaitCondition>
 
 // MythTV headers
-#include "audiooutput.h"
-#include "mythlogging.h"
-#include "mthread.h"
+#include "libmythbase/mthread.h"
+#include "libmythbase/mythlogging.h"
 
+#include "audiooutput.h"
 #include "samplerate.h"
 
 #define VBAUDIO(str)   LOG(VB_AUDIO, LOG_INFO, LOC + (str))
diff --git a/mythtv/libs/libmyth/audio/audiooutputca.cpp b/mythtv/libs/libmyth/audio/audiooutputca.cpp
index 3d29c6b306b..beef4941a62 100644
--- a/mythtv/libs/libmyth/audio/audiooutputca.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputca.cpp
@@ -12,6 +12,8 @@
  * Jeremiah Morris, Andrew Kimpton, Nigel Pearson, Jean-Yves Avenard
  *****************************************************************************/
 
+#include <SoundTouch.h>
+
 #include <array>
 #include <vector>
 
@@ -21,9 +23,8 @@
 #include <AudioToolbox/AudioFormat.h>
 #include <AvailabilityMacros.h>
 
-#include "mythcorecontext.h"
+#include "libmythbase/mythcorecontext.h"
 #include "audiooutputca.h"
-#include "SoundTouch.h"
 
 #if !defined(MAC_OS_VERSION_12_0)
 #define kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster
diff --git a/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp b/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
index 739496fe4dd..55361c3a1a2 100644
--- a/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
@@ -3,8 +3,6 @@
 #include <cstring>
 #include <unistd.h>
 
-#include "mythcorecontext.h"
-
 // libav headers
 extern "C" {
 #include "libavutil/mem.h" // for av_free
@@ -12,10 +10,12 @@ extern "C" {
 }
 
 // MythTV headers
+#include "libmythbase/compat.h"
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythlogging.h"
+
 #include "audiooutputdigitalencoder.h"
 #include "audiooutpututil.h"
-#include "compat.h"
-#include "mythlogging.h"
 
 #define LOC QString("DEnc: ")
 
diff --git a/mythtv/libs/libmyth/audio/audiooutputdx.cpp b/mythtv/libs/libmyth/audio/audiooutputdx.cpp
index 0d07f595822..0cc497f7596 100644
--- a/mythtv/libs/libmyth/audio/audiooutputdx.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputdx.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <cmath>
 
-#include "mythlogging.h"
+#include "libmythbase/mythlogging.h"
 #include "audiooutputdx.h"
 
 #include <windows.h>
diff --git a/mythtv/libs/libmyth/audio/audiooutputgraph.cpp b/mythtv/libs/libmyth/audio/audiooutputgraph.cpp
index a02476d11ec..764e5ff3ce1 100644
--- a/mythtv/libs/libmyth/audio/audiooutputgraph.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputgraph.cpp
@@ -1,3 +1,8 @@
+// Std
+#include <climits>
+#include <cmath>
+#include <cstdint>
+
 // Qt
 #include <QtGlobal>
 #include <QImage>
@@ -6,16 +11,12 @@
 #include <QMutexLocker>
 
 // MythTV
-#include "audiooutputgraph.h"
-#include "mythlogging.h"
-#include "mythpainter.h"
-#include "mythimage.h"
-#include "compat.h"
+#include "libmythbase/compat.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythui/mythimage.h"
+#include "libmythui/mythpainter.h"
 
-// Std
-#include <climits>
-#include <cmath>
-#include <cstdint>
+#include "audiooutputgraph.h"
 
 using namespace std::chrono_literals;
 
diff --git a/mythtv/libs/libmyth/audio/audiooutputgraph.h b/mythtv/libs/libmyth/audio/audiooutputgraph.h
index 3f231a2afe6..4f9650bcbaf 100644
--- a/mythtv/libs/libmyth/audio/audiooutputgraph.h
+++ b/mythtv/libs/libmyth/audio/audiooutputgraph.h
@@ -5,8 +5,8 @@
 #include <QMutex>
 
 // MythTV
-#include "mythexp.h"
-#include "visual.h"
+#include "libmyth/mythexp.h"
+#include "libmyth/visual.h"
 
 class MythImage;
 class MythPainter;
diff --git a/mythtv/libs/libmyth/audio/audiooutputjack.cpp b/mythtv/libs/libmyth/audio/audiooutputjack.cpp
index fc36d5f1c32..ad31536e9c6 100644
--- a/mythtv/libs/libmyth/audio/audiooutputjack.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputjack.cpp
@@ -27,11 +27,10 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include <iostream>
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythdate.h"
 
-#include "mythcorecontext.h"
 #include "audiooutputjack.h"
-#include "mythdate.h"
 
 #define LOC QString("AOJack: ")
 
diff --git a/mythtv/libs/libmyth/audio/audiooutputnull.cpp b/mythtv/libs/libmyth/audio/audiooutputnull.cpp
index ea6d9d9b0f2..9804e0c921e 100644
--- a/mythtv/libs/libmyth/audio/audiooutputnull.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputnull.cpp
@@ -10,10 +10,10 @@
 #ifndef _WIN32
 #include <sys/ioctl.h>
 #else
-#include "compat.h"
+#include "libmythbase/compat.h"
 #endif
 
-#include "mythlogging.h"
+#include "libmythbase/mythlogging.h"
 #include "audiooutputnull.h"
 
 #define CHANNELS_MIN 1
diff --git a/mythtv/libs/libmyth/audio/audiooutputopensles.cpp b/mythtv/libs/libmyth/audio/audiooutputopensles.cpp
index cde619213cd..21b8ddb7a47 100644
--- a/mythtv/libs/libmyth/audio/audiooutputopensles.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputopensles.cpp
@@ -4,7 +4,7 @@
 
 #include <QAndroidJniEnvironment>
 
-#include "mythlogging.h"
+#include "libmythbase/mythlogging.h"
 #include "audiooutputopensles.h"
 
 
diff --git a/mythtv/libs/libmyth/audio/audiooutputoss.cpp b/mythtv/libs/libmyth/audio/audiooutputoss.cpp
index ffe7deeb6e1..bd4187dc53b 100644
--- a/mythtv/libs/libmyth/audio/audiooutputoss.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputoss.cpp
@@ -9,14 +9,14 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "mythconfig.h"
+#include "libmythbase/mythconfig.h"
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythdate.h"
+#include "libmythbase/mythtimer.h"
 
-#define LOC      QString("AOOSS: ")
-
-#include "mythcorecontext.h"
 #include "audiooutputoss.h"
-#include "mythtimer.h"
-#include "mythdate.h"
+
+#define LOC      QString("AOOSS: ")
 
 AudioOutputOSS::AudioOutputOSS(const AudioSettings &settings) :
     AudioOutputBase(settings)
diff --git a/mythtv/libs/libmyth/audio/audiooutputsettings.cpp b/mythtv/libs/libmyth/audio/audiooutputsettings.cpp
index 7e18a10a62c..9abd3e1786e 100644
--- a/mythtv/libs/libmyth/audio/audiooutputsettings.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputsettings.cpp
@@ -9,14 +9,15 @@
 #include <algorithm>
 #include <vector>
 
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythlogging.h"
+
 #include "audiooutputsettings.h"
-#include "mythlogging.h"
-#include "mythcorecontext.h"
+#include "eldutils.h"
 
 extern "C" {
 #include "libavutil/avutil.h"    // to check version of libavformat
 }
-#include "eldutils.h"
 
 #define LOC QString("AOS: ")
 
diff --git a/mythtv/libs/libmyth/audio/audiooutpututil.cpp b/mythtv/libs/libmyth/audio/audiooutpututil.cpp
index 4191415d5a0..4321492d264 100644
--- a/mythtv/libs/libmyth/audio/audiooutpututil.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutpututil.cpp
@@ -5,7 +5,8 @@
 #include <QtGlobal>
 #include <QtEndian>
 
-#include "mythlogging.h"
+#include "libmythbase/mythlogging.h"
+
 #include "audioconvert.h"
 #include "mythaverror.h"
 
diff --git a/mythtv/libs/libmyth/audio/audiooutputwin.cpp b/mythtv/libs/libmyth/audio/audiooutputwin.cpp
index 9e5b7d815ac..46b04941cc9 100644
--- a/mythtv/libs/libmyth/audio/audiooutputwin.cpp
+++ b/mythtv/libs/libmyth/audio/audiooutputwin.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 
-#include "mythlogging.h"
+#include "libmythbase/mythlogging.h"
 #include "audiooutputwin.h"
 
 #include <windows.h>
diff --git a/mythtv/libs/libmyth/audio/audiopulsehandler.cpp b/mythtv/libs/libmyth/audio/audiopulsehandler.cpp
index c5546d43f96..b036d454ca7 100644
--- a/mythtv/libs/libmyth/audio/audiopulsehandler.cpp
+++ b/mythtv/libs/libmyth/audio/audiopulsehandler.cpp
@@ -5,10 +5,11 @@
 
 #include <unistd.h> // for usleep
 
+#include "libmythbase/mythmiscutil.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythbase/mthread.h"
+
 #include "audiopulsehandler.h"
-#include "mythmiscutil.h"
-#include "mythlogging.h"
-#include "mthread.h"
 
 #define LOC QString("Pulse: ")
 
diff --git a/mythtv/libs/libmyth/audio/spdifencoder.cpp b/mythtv/libs/libmyth/audio/spdifencoder.cpp
index 173c565b1a3..a4c88992066 100644
--- a/mythtv/libs/libmyth/audio/spdifencoder.cpp
+++ b/mythtv/libs/libmyth/audio/spdifencoder.cpp
@@ -1,8 +1,9 @@
-#include "mythcorecontext.h"
+#include "libmythbase/compat.h"
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythlogging.h"
 
-#include "compat.h"
 #include "spdifencoder.h"
-#include "mythlogging.h"
+
 extern "C" {
 #include "libavformat/avformat.h"
 #include "libavutil/opt.h"
diff --git a/mythtv/libs/libmyth/audio/spdifencoder.h b/mythtv/libs/libmyth/audio/spdifencoder.h
index 163fd337947..47b8769c8d3 100644
--- a/mythtv/libs/libmyth/audio/spdifencoder.h
+++ b/mythtv/libs/libmyth/audio/spdifencoder.h
@@ -3,8 +3,8 @@
 
 #include <QString>
 
-#include "output.h"
-#include "audiooutput.h"
+#include "libmyth/output.h"
+#include "libmyth/audio/audiooutput.h"
 
 extern "C" {
 #include "libavcodec/avcodec.h"
diff --git a/mythtv/libs/libmyth/audio/volumebase.cpp b/mythtv/libs/libmyth/audio/volumebase.cpp
index c49dca31a93..ce0ce45067c 100644
--- a/mythtv/libs/libmyth/audio/volumebase.cpp
+++ b/mythtv/libs/libmyth/audio/volumebase.cpp
@@ -7,9 +7,10 @@
 #include <QMutex>
 #include <QMutexLocker>
 
+#include "libmythbase/mthread.h"
+#include "libmythbase/mythcorecontext.h"
+
 #include "volumebase.h"
-#include "mythcorecontext.h"
-#include "mthread.h"
 
 
 namespace {
diff --git a/mythtv/libs/libmyth/backendselect.cpp b/mythtv/libs/libmyth/backendselect.cpp
index f9417e98184..b07685cc199 100644
--- a/mythtv/libs/libmyth/backendselect.cpp
+++ b/mythtv/libs/libmyth/backendselect.cpp
@@ -2,16 +2,17 @@
 
 #include <QEventLoop>
 
-#include "mythuistatetype.h"
-#include "mythmainwindow.h"
-#include "mythdialogbox.h"
+#include "libmythbase/configuration.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythbase/mythversion.h"
+#include "libmythui/mythdialogbox.h"
+#include "libmythui/mythmainwindow.h"
+#include "libmythui/mythuibutton.h"
+#include "libmythui/mythuibuttonlist.h"
+#include "libmythui/mythuistatetype.h"
+#include "libmythupnp/mythxmlclient.h"
+
 #include "backendselect.h"
-#include "configuration.h"
-#include "mythxmlclient.h"
-#include "mythuibuttonlist.h"
-#include "mythuibutton.h"
-#include "mythlogging.h"
-#include "mythversion.h"
 
 BackendSelection::BackendSelection(
     MythScreenStack *parent, DatabaseParams *params,
diff --git a/mythtv/libs/libmyth/backendselect.h b/mythtv/libs/libmyth/backendselect.h
index 9e1b2916eb1..77b06d2ac6c 100644
--- a/mythtv/libs/libmyth/backendselect.h
+++ b/mythtv/libs/libmyth/backendselect.h
@@ -3,11 +3,10 @@
 
 #include <QMutex>
 
-// libmythui
-#include "mythscreentype.h"
-
-#include "configuration.h"
-#include "upnpdevice.h"
+// MythTV
+#include "libmythbase/configuration.h"
+#include "libmythui/mythscreentype.h"
+#include "libmythupnp/upnpdevice.h"
 
 class QEventLoop;
 class MythUIButtonList;
diff --git a/mythtv/libs/libmyth/dbsettings.cpp b/mythtv/libs/libmyth/dbsettings.cpp
index 89643cff715..fff7c5c3bc4 100644
--- a/mythtv/libs/libmyth/dbsettings.cpp
+++ b/mythtv/libs/libmyth/dbsettings.cpp
@@ -4,10 +4,11 @@
 #include <QObject>
 
 // MythTV headers
+#include "libmythbase/mythdbcon.h"
+#include "libmythbase/mythdbparams.h"
+
 #include "dbsettings.h"
 #include "mythcontext.h"
-#include "mythdbcon.h"
-#include "mythdbparams.h"
 
 DatabaseSettings::DatabaseSettings(const QString &DBhostOverride)
 {
diff --git a/mythtv/libs/libmyth/guistartup.cpp b/mythtv/libs/libmyth/guistartup.cpp
index 07d7fa2179d..b01463e7bc7 100644
--- a/mythtv/libs/libmyth/guistartup.cpp
+++ b/mythtv/libs/libmyth/guistartup.cpp
@@ -34,24 +34,24 @@
 #include <QFileInfo>
 
 // libmythbase
-#include "mythcorecontext.h"
-#include "mythstorage.h"
-#include "mythdirs.h"
-#include "mythlogging.h"
-#include "mythlocale.h"
-#include "mythtranslation.h"
-#include "iso3166.h"
-#include "iso639.h"
-#include "mythtimer.h"
+#include "libmythbase/iso3166.h"
+#include "libmythbase/iso639.h"
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythdirs.h"
+#include "libmythbase/mythlocale.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythbase/mythstorage.h"
+#include "libmythbase/mythtimer.h"
+#include "libmythbase/mythtranslation.h"
 
 // libmythui
-#include "mythuibuttonlist.h"
-#include "mythuibutton.h"
-#include "mythmainwindow.h"
-#include "mythscreenstack.h"
-#include "mythuistatetype.h"
-#include "mythuiprogressbar.h"
-#include "mythdialogbox.h"
+#include "libmythui/mythdialogbox.h"
+#include "libmythui/mythmainwindow.h"
+#include "libmythui/mythscreenstack.h"
+#include "libmythui/mythuibutton.h"
+#include "libmythui/mythuibuttonlist.h"
+#include "libmythui/mythuiprogressbar.h"
+#include "libmythui/mythuistatetype.h"
 
 #include "guistartup.h"
 
diff --git a/mythtv/libs/libmyth/guistartup.h b/mythtv/libs/libmyth/guistartup.h
index 93ba7ac0d62..59b76be2288 100644
--- a/mythtv/libs/libmyth/guistartup.h
+++ b/mythtv/libs/libmyth/guistartup.h
@@ -31,16 +31,14 @@
 #include <QEventLoop>
 #include <QTimer>
 
-#include "mythchrono.h"
-
 // MythDB headers
 #include "mythexp.h"
 
 // MythBase headers
-#include "mythchrono.h"
+#include "libmythbase/mythchrono.h"
 
 // MythUI headers
-#include "mythscreentype.h"
+#include "libmythui/mythscreentype.h"
 
 class QEventLoop;
 class MythUIButton;
diff --git a/mythtv/libs/libmyth/langsettings.cpp b/mythtv/libs/libmyth/langsettings.cpp
index bc7d637d7b8..5dfea5c1553 100644
--- a/mythtv/libs/libmyth/langsettings.cpp
+++ b/mythtv/libs/libmyth/langsettings.cpp
@@ -7,20 +7,20 @@
 #include <QFileInfo>
 
 // libmythbase
-#include "mythcorecontext.h"
-#include "mythstorage.h"
-#include "mythdirs.h"
-#include "mythlogging.h"
-#include "mythlocale.h"
-#include "mythtranslation.h"
-#include "iso3166.h"
-#include "iso639.h"
+#include "libmythbase/iso3166.h"
+#include "libmythbase/iso639.h"
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythdirs.h"
+#include "libmythbase/mythlocale.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythbase/mythstorage.h"
+#include "libmythbase/mythtranslation.h"
 
 // libmythui
-#include "mythuibuttonlist.h"
-#include "mythuibutton.h"
-#include "mythmainwindow.h"
-#include "mythscreenstack.h"
+#include "libmythui/mythmainwindow.h"
+#include "libmythui/mythscreenstack.h"
+#include "libmythui/mythuibutton.h"
+#include "libmythui/mythuibuttonlist.h"
 
 LanguageSelection::LanguageSelection(MythScreenStack *parent, bool exitOnFinish)
                  :MythScreenType(parent, "LanguageSelection"),
diff --git a/mythtv/libs/libmyth/langsettings.h b/mythtv/libs/libmyth/langsettings.h
index c19f67605f9..4e14785568f 100644
--- a/mythtv/libs/libmyth/langsettings.h
+++ b/mythtv/libs/libmyth/langsettings.h
@@ -9,7 +9,7 @@
 #include "mythexp.h"
 
 // MythUI headers
-#include "mythscreentype.h"
+#include "libmythui/mythscreentype.h"
 
 class QEventLoop;
 class MythUIButtonList;
diff --git a/mythtv/libs/libmyth/libmyth.pro b/mythtv/libs/libmyth/libmyth.pro
index 02654a89b95..9229c0c65b0 100644
--- a/mythtv/libs/libmyth/libmyth.pro
+++ b/mythtv/libs/libmyth/libmyth.pro
@@ -89,17 +89,9 @@ HEADERS += netgrabbermanager.h
 SOURCES += mythrssmanager.cpp           netutils.cpp
 SOURCES += netgrabbermanager.cpp
 
-INCLUDEPATH += ../libmythfreesurround
-INCLUDEPATH += ../libmythbase
-INCLUDEPATH += ../.. ../ ./ ../libmythupnp ../libmythui
-INCLUDEPATH += ../.. ../../external/FFmpeg
-INCLUDEPATH += ../libmythservicecontracts
+INCLUDEPATH += ..
+INCLUDEPATH += ../../external/FFmpeg
 INCLUDEPATH += $${POSTINC}
-DEPENDPATH += ../libmythfreesurround
-DEPENDPATH += ../ ../libmythui ../libmythbase
-DEPENDPATH += ../libmythupnp
-DEPENDPATH += ./audio
-DEPENDPATH += ../libmythservicecontracts
 
 LIBS += -L../libmythbase           -lmythbase-$${LIBVERSION}
 LIBS += -L../libmythui           -lmythui-$${LIBVERSION}
diff --git a/mythtv/libs/libmyth/mediamonitor-darwin.cpp b/mythtv/libs/libmyth/mediamonitor-darwin.cpp
index 38891ccb93e..5c7fc3ef352 100644
--- a/mythtv/libs/libmyth/mediamonitor-darwin.cpp
+++ b/mythtv/libs/libmyth/mediamonitor-darwin.cpp
@@ -8,12 +8,12 @@
 #include <QDir>
 #include <QMetaType>
 
-#include "mythmediamonitor.h"
-#include "mediamonitor-darwin.h"
-#include "mythcdrom.h"
-#include "mythhdd.h"
+#include "libmythbase/mythcdrom.h"
+#include "libmythbase/mythhdd.h"
+#include "libmythbase/mythlogging.h"
 
-#include "mythlogging.h"
+#include "mediamonitor-darwin.h"
+#include "mythmediamonitor.h"
 
 #include <IOKit/IOKitLib.h>
 #include <IOKit/storage/IOMedia.h>
diff --git a/mythtv/libs/libmyth/mediamonitor-unix.cpp b/mythtv/libs/libmyth/mediamonitor-unix.cpp
index 75ce5fefe28..1771ac876f1 100644
--- a/mythtv/libs/libmyth/mediamonitor-unix.cpp
+++ b/mythtv/libs/libmyth/mediamonitor-unix.cpp
@@ -18,9 +18,6 @@
 #include <sys/wait.h>
 #include <sys/param.h>
 
-// C++ headers
-#include <iostream>
-
 // Qt headers
 #include <QtGlobal>
 #if CONFIG_QTDBUS
@@ -33,15 +30,16 @@
 #include <QRegularExpression>
 
 // MythTV headers
-#include "mythmediamonitor.h"
+#include "libmythbase/exitcodes.h"
+#include "libmythbase/mythcdrom.h"
+#include "libmythbase/mythconfig.h"
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythhdd.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythbase/mythsystemlegacy.h"
+
 #include "mediamonitor-unix.h"
-#include "mythconfig.h"
-#include "mythcorecontext.h"
-#include "mythcdrom.h"
-#include "mythhdd.h"
-#include "mythlogging.h"
-#include "mythsystemlegacy.h"
-#include "exitcodes.h"
+#include "mythmediamonitor.h"
 
 #if HAVE_LIBUDEV
 extern "C" {
diff --git a/mythtv/libs/libmyth/mediamonitor-unix.h b/mythtv/libs/libmyth/mediamonitor-unix.h
index 827c7eb52db..2723e6b08be 100644
--- a/mythtv/libs/libmyth/mediamonitor-unix.h
+++ b/mythtv/libs/libmyth/mediamonitor-unix.h
@@ -4,7 +4,7 @@
 #define DEFAULT_DVD "/dev/dvd"
 #define DEFAULT_CD  "/dev/cdrom"
 
-#include "mythconfig.h"
+#include "libmythbase/mythconfig.h"
 
 #include <QString>
 #if CONFIG_QTDBUS
diff --git a/mythtv/libs/libmyth/mediamonitor-windows.cpp b/mythtv/libs/libmyth/mediamonitor-windows.cpp
index 2e7f719e65a..d38a7c40293 100644
--- a/mythtv/libs/libmyth/mediamonitor-windows.cpp
+++ b/mythtv/libs/libmyth/mediamonitor-windows.cpp
@@ -5,13 +5,13 @@
 
 #undef UNICODE
 #define _WIN32_WINNT 0x0500
-#include "compat.h"
 
-#include "mediamonitor-windows.h"
-#include "mythcdrom.h"
-#include "mythhdd.h"
-#include "mythlogging.h"
+#include "libmythbase/compat.h"
+#include "libmythbase/mythcdrom.h"
+#include "libmythbase/mythhdd.h"
+#include "libmythbase/mythlogging.h"
 
+#include "mediamonitor-windows.h"
 
 /**
  * \class MediaMonitorWindows
diff --git a/mythtv/libs/libmyth/mythcontext.cpp b/mythtv/libs/libmyth/mythcontext.cpp
index c8152aa3f14..30cac8d6b37 100644
--- a/mythtv/libs/libmyth/mythcontext.cpp
+++ b/mythtv/libs/libmyth/mythcontext.cpp
@@ -1,59 +1,55 @@
+#include <algorithm>
+#include <cmath>
+#include <iostream>
+#include <queue>
+#include <thread>
+#include <unistd.h> // for usleep(), gethostname
+#include <vector>
+
 #include <QCoreApplication>
+#include <QDateTime>
+#include <QDebug>
 #include <QDir>
+#include <QEventLoop>
 #include <QFileInfo>
-#include <QDebug>
 #include <QHostInfo>
 #include <QMutex>
-#include <QDateTime>
 #include <QTcpSocket>
-#include <QEventLoop>
-
 #ifdef Q_OS_ANDROID
 #include <QtAndroidExtras>
 #endif
 
-#include <algorithm>
-#include <cmath>
-#include <iostream>
-#include <queue>
-#include <thread>
-#include <vector>
+#ifdef _WIN32
+#include "libmythbase/compat.h"
+#endif
+#include "libmythbase/dbutil.h"
+#include "libmythbase/exitcodes.h"
+#include "libmythbase/mythdate.h"
+#include "libmythbase/mythdb.h"
+#include "libmythbase/mythdirs.h"
+#include "libmythbase/mythevent.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythbase/mythmiscutil.h"
+#include "libmythbase/mythplugin.h"
+#include "libmythbase/mythsystemlegacy.h"
+#include "libmythbase/mythtranslation.h"
+#include "libmythbase/mythversion.h"
+#include "libmythbase/portchecker.h"
+#include "libmythbase/remotefile.h"
+#include "libmythui/mythdialogbox.h"
+#include "libmythui/mythimage.h"
+#include "libmythui/mythmainwindow.h"
+#include "libmythui/mythuihelper.h"
+#include "libmythupnp/mythxmlclient.h"
+#include "libmythupnp/upnp.h"
 
-#include "mythcontext.h"
-#include "exitcodes.h"
-#include "mythdate.h"
-#include "remotefile.h"
 #include "backendselect.h"
 #include "dbsettings.h"
+#include "guistartup.h"
 #include "langsettings.h"
-#include "mythtranslation.h"
-#include "mythevent.h"
-#include "dbutil.h"
+#include "mythcontext.h"
 #include "mythmediamonitor.h"
 
-#include "mythdb.h"
-#include "mythdirs.h"
-#include "mythversion.h"
-#include "mythdialogbox.h"
-#include "mythmainwindow.h"
-#include "mythuihelper.h"
-#include "mythimage.h"
-#include "mythxmlclient.h"
-#include "upnp.h"
-#include "mythlogging.h"
-#include "mythsystemlegacy.h"
-#include "mythmiscutil.h"
-
-#include "mythplugin.h"
-#include "portchecker.h"
-#include "guistartup.h"
-
-#include <unistd.h> // for usleep(), gethostname
-
-#ifdef _WIN32
-#include "compat.h"
-#endif
-
 #define LOC      QString("MythContext: ")
 
 #if QT_VERSION < QT_VERSION_CHECK(5,10,0)
diff --git a/mythtv/libs/libmyth/mythmediamonitor.cpp b/mythtv/libs/libmyth/mythmediamonitor.cpp
index 2876670aff2..0cbd0ef2c44 100644
--- a/mythtv/libs/libmyth/mythmediamonitor.cpp
+++ b/mythtv/libs/libmyth/mythmediamonitor.cpp
@@ -14,17 +14,17 @@
 #include <QDir>
 
 // MythTV headers
-#include "mythmediamonitor.h"
-#include "mythcdrom.h"
-#include "mythcorecontext.h"
-#include "mythconfig.h"
-#include "mythdialogbox.h"
-#include "mythdate.h"
-#include "mythlogging.h"
-#include "mythmainwindow.h"
-#include "mythsystemlegacy.h"
-#include "mythmiscutil.h"
+#include "libmythbase/mythcdrom.h"
+#include "libmythbase/mythconfig.h"
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythdate.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythbase/mythmiscutil.h"
+#include "libmythbase/mythsystemlegacy.h"
+#include "libmythui/mythdialogbox.h"
+#include "libmythui/mythmainwindow.h"
 
+#include "mythmediamonitor.h"
 #ifdef USING_DARWIN_DA
 #include "mediamonitor-darwin.h"
 #elif defined(Q_OS_WIN)
diff --git a/mythtv/libs/libmyth/mythrssmanager.cpp b/mythtv/libs/libmyth/mythrssmanager.cpp
index c25a8fd1ed4..cc61ee2e3e1 100644
--- a/mythtv/libs/libmyth/mythrssmanager.cpp
+++ b/mythtv/libs/libmyth/mythrssmanager.cpp
@@ -3,15 +3,15 @@
 #include <QFile>
 #include <QString>
 
-#include "mythdate.h"
-#include "mythdirs.h"
-#include "mythcontext.h"
-#include "mythlogging.h"
+#include "libmythbase/mythdate.h"
+#include "libmythbase/mythdirs.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythbase/mythsorthelper.h"
 
+#include "mythcontext.h"
 #include "mythrssmanager.h"
 #include "netutils.h"
 #include "rssparse.h"
-#include "mythsorthelper.h"
 
 #define LOC      QString("RSSSite: ")
 
diff --git a/mythtv/libs/libmyth/mythterminal.cpp b/mythtv/libs/libmyth/mythterminal.cpp
index 4d2347fa23f..1a90568fc7d 100644
--- a/mythtv/libs/libmyth/mythterminal.cpp
+++ b/mythtv/libs/libmyth/mythterminal.cpp
@@ -22,11 +22,12 @@
 #include <utility>
 
 // MythTV headers
-#include "mythlogging.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythui/mythuibutton.h"
+#include "libmythui/mythuibuttonlist.h"
+#include "libmythui/mythuitextedit.h"
+
 #include "mythterminal.h"
-#include "mythuibutton.h"
-#include "mythuibuttonlist.h"
-#include "mythuitextedit.h"
 
 MythTerminal::MythTerminal(MythScreenStack *parent, QString _program,
                            QStringList _arguments) :
diff --git a/mythtv/libs/libmyth/mythterminal.h b/mythtv/libs/libmyth/mythterminal.h
index dca116bafee..285b83122c9 100644
--- a/mythtv/libs/libmyth/mythterminal.h
+++ b/mythtv/libs/libmyth/mythterminal.h
@@ -15,7 +15,7 @@
 
 // MythTV headers
 #include "mythexp.h"
-#include "mythscreentype.h"
+#include "libmythui/mythscreentype.h"
 
 class MythUIButton;
 class MythUIButtonList;
diff --git a/mythtv/libs/libmyth/netgrabbermanager.cpp b/mythtv/libs/libmyth/netgrabbermanager.cpp
index c0758625c3d..7c4181b94cf 100644
--- a/mythtv/libs/libmyth/netgrabbermanager.cpp
+++ b/mythtv/libs/libmyth/netgrabbermanager.cpp
@@ -5,14 +5,14 @@
 #include <QString>
 #include <utility>
 
-#include "mythdirs.h"
-#include "mythcontext.h"
-#include "mythsystemlegacy.h"
-#include "exitcodes.h"
-#include "mythdate.h"
-#include "mythlogging.h"
-#include "mythsystemlegacy.h"
+#include "libmythbase/exitcodes.h"
+#include "libmythbase/mythdate.h"
+#include "libmythbase/mythdirs.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythbase/mythsystemlegacy.h"
+#include "libmythbase/mythsystemlegacy.h"
 
+#include "mythcontext.h"
 #include "netgrabbermanager.h"
 #include "netutils.h"
 
diff --git a/mythtv/libs/libmyth/netutils.cpp b/mythtv/libs/libmyth/netutils.cpp
index 1445b6614b4..3ac1d77c399 100644
--- a/mythtv/libs/libmyth/netutils.cpp
+++ b/mythtv/libs/libmyth/netutils.cpp
@@ -1,11 +1,11 @@
 #include <QDir>
 #include <QFileInfo>
 
-#include "mythdirs.h"
-#include "mythdb.h"
-#include "mythcontext.h"
-#include "mythdate.h"
+#include "libmythbase/mythdate.h"
+#include "libmythbase/mythdb.h"
+#include "libmythbase/mythdirs.h"
 
+#include "mythcontext.h"
 #include "netutils.h"
 
 bool findTreeGrabberInDB(const QString& commandline,
diff --git a/mythtv/libs/libmyth/programinfo.cpp b/mythtv/libs/libmyth/programinfo.cpp
index 10c3cb9a33c..43e7b8d5094 100644
--- a/mythtv/libs/libmyth/programinfo.cpp
+++ b/mythtv/libs/libmyth/programinfo.cpp
@@ -1,9 +1,7 @@
 // -*- Mode: c++ -*-
 
 // POSIX headers
-// FIXME What are these used for?
-// #include <sys/types.h>
-// #include <unistd.h>
+#include <unistd.h> // for getpid()
 
 // C++ headers
 #include <algorithm>
@@ -16,22 +14,21 @@
 #include <QDir>
 
 // MythTV headers
-#include "programinfoupdater.h"
-#include "mythcorecontext.h"
-#include "mythscheduler.h"
-#include "mythmiscutil.h"
-#include "stringutil.h"
-#include "storagegroup.h"
-#include "mythlogging.h"
+#include "libmythbase/compat.h"
+#include "libmythbase/mythcdrom.h"
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythdb.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythbase/mythmiscutil.h"
+#include "libmythbase/mythscheduler.h"
+#include "libmythbase/mythsorthelper.h"
+#include "libmythbase/remotefile.h"
+#include "libmythbase/storagegroup.h"
+#include "libmythbase/stringutil.h"
+
 #include "programinfo.h"
-#include "remotefile.h"
+#include "programinfoupdater.h"
 #include "remoteutil.h"
-#include "mythdb.h"
-#include "compat.h"
-#include "mythcdrom.h"
-#include "mythsorthelper.h"
-
-#include <unistd.h> // for getpid()
 
 #define LOC      QString("ProgramInfo(%1): ").arg(GetBasename())
 
diff --git a/mythtv/libs/libmyth/programinfoupdater.cpp b/mythtv/libs/libmyth/programinfoupdater.cpp
index 049f0b63dae..4e5953cca2a 100644
--- a/mythtv/libs/libmyth/programinfoupdater.cpp
+++ b/mythtv/libs/libmyth/programinfoupdater.cpp
@@ -1,12 +1,14 @@
+// Posix headers
+#include <unistd.h> // for usleep()
+
 // MythTV headers
+#include "libmythbase/mthreadpool.h"
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythlogging.h"
+
 #include "programinfoupdater.h"
-#include "mthreadpool.h"
-#include "mythlogging.h"
-#include "mythcorecontext.h"
 #include "remoteutil.h"
 
-#include <unistd.h> // for usleep()
-
 void ProgramInfoUpdater::insert(
     uint     recordedid, PIAction action, uint64_t filesize)
 {
diff --git a/mythtv/libs/libmyth/rawsettingseditor.cpp b/mythtv/libs/libmyth/rawsettingseditor.cpp
index 142ae549525..89099a7f222 100644
--- a/mythtv/libs/libmyth/rawsettingseditor.cpp
+++ b/mythtv/libs/libmyth/rawsettingseditor.cpp
@@ -1,11 +1,12 @@
 
-#include "mythcorecontext.h"
-#include "mythlogging.h"
-#include "mythuibutton.h"
-#include "mythuibuttonlist.h"
-#include "mythuishape.h"
-#include "mythuitext.h"
-#include "mythuitextedit.h"
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythui/mythuibutton.h"
+#include "libmythui/mythuibuttonlist.h"
+#include "libmythui/mythuishape.h"
+#include "libmythui/mythuitext.h"
+#include "libmythui/mythuitextedit.h"
+
 #include "rawsettingseditor.h"
 #include "remoteutil.h"
 
diff --git a/mythtv/libs/libmyth/rawsettingseditor.h b/mythtv/libs/libmyth/rawsettingseditor.h
index 178ff60344d..47e66bb43f1 100644
--- a/mythtv/libs/libmyth/rawsettingseditor.h
+++ b/mythtv/libs/libmyth/rawsettingseditor.h
@@ -6,7 +6,7 @@
 #include <QObject>
 
 #include "mythexp.h"
-#include "mythscreentype.h"
+#include "libmythui/mythscreentype.h"
 
 class MythUIButtonList;
 class MythUIButtonListItem;
diff --git a/mythtv/libs/libmyth/remoteutil.cpp b/mythtv/libs/libmyth/remoteutil.cpp
index 20726d7fff2..13fa70be17e 100644
--- a/mythtv/libs/libmyth/remoteutil.cpp
+++ b/mythtv/libs/libmyth/remoteutil.cpp
@@ -5,13 +5,14 @@
 #include <QDir>
 #include <QList>
 
-#include "compat.h"
-#include "remoteutil.h"
+#include "libmythbase/compat.h"
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythevent.h"
+#include "libmythbase/mythsocket.h"
+#include "libmythbase/storagegroup.h"
+
 #include "programinfo.h"
-#include "mythcorecontext.h"
-#include "storagegroup.h"
-#include "mythevent.h"
-#include "mythsocket.h"
+#include "remoteutil.h"
 
 std::vector<ProgramInfo *> *RemoteGetRecordedList(int sort)
 {
diff --git a/mythtv/libs/libmyth/remoteutil.h b/mythtv/libs/libmyth/remoteutil.h
index 469167d8c2f..7476c45585a 100644
--- a/mythtv/libs/libmyth/remoteutil.h
+++ b/mythtv/libs/libmyth/remoteutil.h
@@ -1,13 +1,14 @@
 #ifndef REMOTEUTIL_H_
 #define REMOTEUTIL_H_
 
+#include <array>
 #include <ctime>
+#include <vector>
 
-#include <QStringList>
 #include <QDateTime>
+#include <QStringList>
 
-#include <array>
-#include <vector>
+#include "libmythbase/mythchrono.h"
 
 #include "mythexp.h"
 
diff --git a/mythtv/libs/libmyth/rssparse.cpp b/mythtv/libs/libmyth/rssparse.cpp
index b559ccb9c5d..e03cafe868d 100644
--- a/mythtv/libs/libmyth/rssparse.cpp
+++ b/mythtv/libs/libmyth/rssparse.cpp
@@ -7,12 +7,13 @@
 #include <QUrl>
 #include <QFileInfo>
 
-#include "rssparse.h"
+#include "libmythbase/mythdate.h"
+#include "libmythbase/mythdirs.h"
+#include "libmythbase/mythsorthelper.h"
+#include "libmythbase/stringutil.h"
+
 #include "mythcontext.h"
-#include "mythdirs.h"
-#include "mythdate.h"
-#include "stringutil.h"
-#include "mythsorthelper.h"
+#include "rssparse.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(5,15,2)
 #define capturedView capturedRef
diff --git a/mythtv/libs/libmyth/schemawizard.cpp b/mythtv/libs/libmyth/schemawizard.cpp
index 9a8a794cfc0..81f80e1f925 100644
--- a/mythtv/libs/libmyth/schemawizard.cpp
+++ b/mythtv/libs/libmyth/schemawizard.cpp
@@ -6,18 +6,18 @@ using std::endl;
 
 #include <QEventLoop>
 
-#include "mythdialogbox.h"
-#include "mythcorecontext.h"
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythdate.h"
+#include "libmythbase/mythdb.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythbase/mythmiscutil.h"
+#include "libmythbase/mythtimer.h"
+#include "libmythui/mythdialogbox.h"
+#include "libmythui/mythmainwindow.h"
+#include "libmythui/mythprogressdialog.h"
+#include "libmythui/mythuihelper.h"
+
 #include "schemawizard.h"
-#include "mythdate.h"
-
-#include "mythtimer.h"
-#include "mythlogging.h"
-#include "mythmainwindow.h"
-#include "mythprogressdialog.h"
-#include "mythuihelper.h"
-#include "mythmiscutil.h"
-#include "mythdb.h"
 
 
 static SchemaUpgradeWizard * c_wizard = nullptr;
diff --git a/mythtv/libs/libmyth/standardsettings.cpp b/mythtv/libs/libmyth/standardsettings.cpp
index 8be21729ee2..7c08a30feda 100644
--- a/mythtv/libs/libmyth/standardsettings.cpp
+++ b/mythtv/libs/libmyth/standardsettings.cpp
@@ -4,14 +4,15 @@
 #include <QThread>
 #include <utility>
 
-#include <mythcontext.h>
-#include <mythmainwindow.h>
-#include <mythdialogbox.h>
-#include <mythuispinbox.h>
-#include <mythuitext.h>
-#include <mythuibutton.h>
-#include <mythuifilebrowser.h>
-#include "mythlogging.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythui/mythdialogbox.h"
+#include "libmythui/mythmainwindow.h"
+#include "libmythui/mythuibutton.h"
+#include "libmythui/mythuifilebrowser.h"
+#include "libmythui/mythuispinbox.h"
+#include "libmythui/mythuitext.h"
+
+#include "mythcontext.h"
 
 void MythUIButtonListItemSetting::ShouldUpdate(StandardSetting *setting)
 {
diff --git a/mythtv/libs/libmyth/storagegroupeditor.cpp b/mythtv/libs/libmyth/storagegroupeditor.cpp
index 8a845f3f07b..ed9ecd23a32 100644
--- a/mythtv/libs/libmyth/storagegroupeditor.cpp
+++ b/mythtv/libs/libmyth/storagegroupeditor.cpp
@@ -7,12 +7,13 @@
 #include <utility>
 
 // MythTV headers
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythdate.h"
+#include "libmythbase/mythdb.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythui/mythuifilebrowser.h"
+
 #include "storagegroupeditor.h"
-#include "mythcorecontext.h"
-#include "mythdb.h"
-#include "mythlogging.h"
-#include "mythdate.h"
-#include "mythuifilebrowser.h"
 
 #define LOC QString("SGE(%1): ").arg(m_groupname)
 
diff --git a/mythtv/libs/libmyth/storagegroupeditor.h b/mythtv/libs/libmyth/storagegroupeditor.h
index 71339f0b3c3..707c2dd2e1f 100644
--- a/mythtv/libs/libmyth/storagegroupeditor.h
+++ b/mythtv/libs/libmyth/storagegroupeditor.h
@@ -1,7 +1,7 @@
 #ifndef STORAGEGROUPEDITOR_H
 #define STORAGEGROUPEDITOR_H
 
-#include "storagegroup.h"
+#include "libmythbase/storagegroup.h"
 #include "standardsettings.h"
 #include "mythexp.h"