diff --git a/mythplugins/mytharchive/mytharchive/archivedbcheck.cpp b/mythplugins/mytharchive/mytharchive/archivedbcheck.cpp
index 5573dc98f87..cb215e266c1 100644
--- a/mythplugins/mytharchive/mytharchive/archivedbcheck.cpp
+++ b/mythplugins/mytharchive/mytharchive/archivedbcheck.cpp
@@ -8,6 +8,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcheck.h>
+#include <libmythbase/mythlogging.h>
 
 // mytharchive
 #include "archivedbcheck.h"
diff --git a/mythplugins/mytharchive/mytharchive/exportnative.cpp b/mythplugins/mytharchive/mytharchive/exportnative.cpp
index ac99e6bc36f..51253d46288 100644
--- a/mythplugins/mytharchive/mytharchive/exportnative.cpp
+++ b/mythplugins/mytharchive/mytharchive/exportnative.cpp
@@ -13,6 +13,7 @@
 #include <libmythbase/exitcodes.h>
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsystemlegacy.h>
 #include <libmythbase/programinfo.h>
 #include <libmythbase/remoteutil.h>
diff --git a/mythplugins/mytharchive/mytharchive/fileselector.cpp b/mythplugins/mytharchive/mytharchive/fileselector.cpp
index 3be12a52ae7..eb13c9ccbed 100644
--- a/mythplugins/mytharchive/mytharchive/fileselector.cpp
+++ b/mythplugins/mytharchive/mytharchive/fileselector.cpp
@@ -8,6 +8,7 @@
 
 // Myth
 #include <libmythbase/mythdb.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/stringutil.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>
diff --git a/mythplugins/mytharchive/mytharchive/importnative.cpp b/mythplugins/mytharchive/mytharchive/importnative.cpp
index 45f5efbf6cb..3976daeb102 100644
--- a/mythplugins/mytharchive/mytharchive/importnative.cpp
+++ b/mythplugins/mytharchive/mytharchive/importnative.cpp
@@ -11,6 +11,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdbcon.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsystemlegacy.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>
diff --git a/mythplugins/mytharchive/mytharchive/logviewer.cpp b/mythplugins/mytharchive/mytharchive/logviewer.cpp
index 461454b8076..ea14732290f 100644
--- a/mythplugins/mytharchive/mytharchive/logviewer.cpp
+++ b/mythplugins/mytharchive/mytharchive/logviewer.cpp
@@ -12,6 +12,7 @@
 // mythtv
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdbcon.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>
 #include <libmythui/mythuibutton.h>
diff --git a/mythplugins/mytharchive/mytharchive/mytharchive.cpp b/mythplugins/mytharchive/mytharchive/mytharchive.cpp
index 756f3de65f3..8b6b2a35f37 100644
--- a/mythplugins/mytharchive/mytharchive/mytharchive.cpp
+++ b/mythplugins/mytharchive/mytharchive/mytharchive.cpp
@@ -20,6 +20,7 @@
 // mythtv
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythcoreutil.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythplugin.h>
 #include <libmythbase/mythpluginapi.h>
 #include <libmythbase/mythsystemlegacy.h>
diff --git a/mythplugins/mytharchive/mytharchive/mythburn.cpp b/mythplugins/mytharchive/mytharchive/mythburn.cpp
index 157e333fcbe..5c8a564f312 100644
--- a/mythplugins/mytharchive/mytharchive/mythburn.cpp
+++ b/mythplugins/mytharchive/mytharchive/mythburn.cpp
@@ -17,6 +17,7 @@
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythmiscutil.h>
 #include <libmythbase/mythsystemlegacy.h>
 #include <libmythbase/stringutil.h>
diff --git a/mythplugins/mytharchive/mytharchive/remoteavformatcontext.h b/mythplugins/mytharchive/mytharchive/remoteavformatcontext.h
index d3729689c4c..ef5a2233319 100644
--- a/mythplugins/mytharchive/mytharchive/remoteavformatcontext.h
+++ b/mythplugins/mytharchive/mytharchive/remoteavformatcontext.h
@@ -5,7 +5,6 @@
 
 #include <QString>
 
-#include <libmythbase/mythlogging.h>
 #include <libmythbase/remotefile.h>
 
 extern "C" {
diff --git a/mythplugins/mytharchive/mytharchive/selectdestination.cpp b/mythplugins/mytharchive/mytharchive/selectdestination.cpp
index 20b6fd39699..3f3e395d3ae 100644
--- a/mythplugins/mytharchive/mytharchive/selectdestination.cpp
+++ b/mythplugins/mytharchive/mytharchive/selectdestination.cpp
@@ -9,6 +9,7 @@
 // myth
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythcoreutil.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/stringutil.h>
 #include <libmythui/mythmainwindow.h>
 #include <libmythui/mythuibutton.h>
diff --git a/mythplugins/mytharchive/mytharchive/themeselector.cpp b/mythplugins/mytharchive/mytharchive/themeselector.cpp
index 45998734943..f8641b18bf1 100644
--- a/mythplugins/mytharchive/mytharchive/themeselector.cpp
+++ b/mythplugins/mytharchive/mytharchive/themeselector.cpp
@@ -13,6 +13,7 @@
 // myth
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythmainwindow.h>
 #include <libmythui/mythuibutton.h>
 #include <libmythui/mythuibuttonlist.h>
diff --git a/mythplugins/mytharchive/mytharchive/thumbfinder.cpp b/mythplugins/mytharchive/mytharchive/thumbfinder.cpp
index 961de0a9b1a..4da1fa20f7b 100644
--- a/mythplugins/mytharchive/mytharchive/thumbfinder.cpp
+++ b/mythplugins/mytharchive/mytharchive/thumbfinder.cpp
@@ -44,6 +44,7 @@
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythmiscutil.h> // for MythFile::copy
 #include <libmythbase/programinfo.h>
 #include <libmythui/mythdialogbox.h>
diff --git a/mythplugins/mytharchive/mytharchive/videoselector.cpp b/mythplugins/mytharchive/mytharchive/videoselector.cpp
index 8d7d124c6bf..853193769ed 100644
--- a/mythplugins/mytharchive/mytharchive/videoselector.cpp
+++ b/mythplugins/mytharchive/mytharchive/videoselector.cpp
@@ -10,6 +10,7 @@
 // mythtv
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/remotefile.h>
 #include <libmythbase/stringutil.h>
 #include <libmythbase/storagegroup.h>
diff --git a/mythplugins/mythbrowser/mythbrowser/bookmarkeditor.cpp b/mythplugins/mythbrowser/mythbrowser/bookmarkeditor.cpp
index 9359d70d96c..f1a62856618 100644
--- a/mythplugins/mythbrowser/mythbrowser/bookmarkeditor.cpp
+++ b/mythplugins/mythbrowser/mythbrowser/bookmarkeditor.cpp
@@ -2,6 +2,7 @@
 // MythTV
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdbcon.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythmainwindow.h>
 
 // mythbrowser
diff --git a/mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp b/mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp
index 33e832301ee..5ff06e0794d 100644
--- a/mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp
+++ b/mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp
@@ -9,6 +9,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsystemlegacy.h>
 #include <libmythui/mythmainwindow.h>
 #include <libmythui/mythuibuttonlist.h>
diff --git a/mythplugins/mythbrowser/mythbrowser/browserdbutil.cpp b/mythplugins/mythbrowser/mythbrowser/browserdbutil.cpp
index 610238e57af..d9ecced35c2 100644
--- a/mythplugins/mythbrowser/mythbrowser/browserdbutil.cpp
+++ b/mythplugins/mythbrowser/mythbrowser/browserdbutil.cpp
@@ -5,6 +5,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcheck.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsorthelper.h>
 
 // mythbrowser
diff --git a/mythplugins/mythbrowser/mythbrowser/libmythbrowser.cpp b/mythplugins/mythbrowser/mythbrowser/libmythbrowser.cpp
index df9af94f51c..4cf28dd2713 100644
--- a/mythplugins/mythbrowser/mythbrowser/libmythbrowser.cpp
+++ b/mythplugins/mythbrowser/mythbrowser/libmythbrowser.cpp
@@ -6,6 +6,7 @@
 
 // MythTV
 #include <libmythbase/mythcorecontext.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythpluginapi.h>
 #include <libmythbase/mythversion.h>
 #include <libmythui/mythmainwindow.h>
diff --git a/mythplugins/mythbrowser/mythbrowser/webpage.cpp b/mythplugins/mythbrowser/mythbrowser/webpage.cpp
index 9b1208f3321..00c5e984115 100644
--- a/mythplugins/mythbrowser/mythbrowser/webpage.cpp
+++ b/mythplugins/mythbrowser/mythbrowser/webpage.cpp
@@ -6,7 +6,6 @@
 #include <QIcon>
 
 // MythTV
-#include <libmythbase/mythlogging.h>
 #include <libmythui/mythmainwindow.h>
 
 // mythbrowser
diff --git a/mythplugins/mythgame/mythgame/gamedbcheck.cpp b/mythplugins/mythgame/mythgame/gamedbcheck.cpp
index 2e1cec47361..aca4a563f4f 100644
--- a/mythplugins/mythgame/mythgame/gamedbcheck.cpp
+++ b/mythplugins/mythgame/mythgame/gamedbcheck.cpp
@@ -9,6 +9,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcheck.h>
+#include <libmythbase/mythlogging.h>
 
 // MythGame
 #include "gamedbcheck.h"
diff --git a/mythplugins/mythgame/mythgame/gamehandler.cpp b/mythplugins/mythgame/mythgame/gamehandler.cpp
index 1bd6f0c2ed9..26e36136439 100644
--- a/mythplugins/mythgame/mythgame/gamehandler.cpp
+++ b/mythplugins/mythgame/mythgame/gamehandler.cpp
@@ -10,6 +10,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcon.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsystemlegacy.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>
diff --git a/mythplugins/mythgame/mythgame/gamesettings.cpp b/mythplugins/mythgame/mythgame/gamesettings.cpp
index d709967a753..f307117f7e2 100644
--- a/mythplugins/mythgame/mythgame/gamesettings.cpp
+++ b/mythplugins/mythgame/mythgame/gamesettings.cpp
@@ -7,6 +7,7 @@
 // MythTV
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 
 // MythGame
 #include "gamesettings.h"
diff --git a/mythplugins/mythgame/mythgame/gameui.cpp b/mythplugins/mythgame/mythgame/gameui.cpp
index c5ef508f32a..12ee17b0052 100644
--- a/mythplugins/mythgame/mythgame/gameui.cpp
+++ b/mythplugins/mythgame/mythgame/gameui.cpp
@@ -6,6 +6,7 @@
 // MythTV
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythmetadata/mythuimetadataresults.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythgenerictree.h>
diff --git a/mythplugins/mythgame/mythgame/mythgame.cpp b/mythplugins/mythgame/mythgame/mythgame.cpp
index 33b8fe305b4..c6ec4d07623 100644
--- a/mythplugins/mythgame/mythgame/mythgame.cpp
+++ b/mythplugins/mythgame/mythgame/mythgame.cpp
@@ -2,6 +2,7 @@
 #include <libmythbase/lcddevice.h>
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdbcon.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythpluginapi.h>
 #include <libmythbase/mythversion.h>
 #include <libmythui/myththemedmenu.h>
diff --git a/mythplugins/mythgame/mythgame/romedit.cpp b/mythplugins/mythgame/mythgame/romedit.cpp
index 1489b9ced1a..b6c7eafd944 100644
--- a/mythplugins/mythgame/mythgame/romedit.cpp
+++ b/mythplugins/mythgame/mythgame/romedit.cpp
@@ -5,6 +5,7 @@
 // MythtTV
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>
 #include <libmythui/mythuibutton.h>
diff --git a/mythplugins/mythmusic/mythmusic/editmetadata.cpp b/mythplugins/mythmusic/mythmusic/editmetadata.cpp
index 517af972af1..781c3a187b9 100644
--- a/mythplugins/mythmusic/mythmusic/editmetadata.cpp
+++ b/mythplugins/mythmusic/mythmusic/editmetadata.cpp
@@ -9,6 +9,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/remotefile.h>
 #include <libmythmetadata/metaio.h>
 #include <libmythmetadata/musicutils.h>
diff --git a/mythplugins/mythmusic/mythmusic/flacencoder.cpp b/mythplugins/mythmusic/mythmusic/flacencoder.cpp
index 9f883dd49d5..b3f330ba201 100644
--- a/mythplugins/mythmusic/mythmusic/flacencoder.cpp
+++ b/mythplugins/mythmusic/mythmusic/flacencoder.cpp
@@ -7,6 +7,7 @@
 #include <QString>
 
 // MythTV
+#include <libmythbase/mythlogging.h>
 #include <libmythmetadata/metaioflacvorbis.h>
 #include <libmythmetadata/musicmetadata.h>
 
diff --git a/mythplugins/mythmusic/mythmusic/generalsettings.cpp b/mythplugins/mythmusic/mythmusic/generalsettings.cpp
index 9fb8ddd8096..0c76e96d3fa 100644
--- a/mythplugins/mythmusic/mythmusic/generalsettings.cpp
+++ b/mythplugins/mythmusic/mythmusic/generalsettings.cpp
@@ -4,6 +4,7 @@
 
 // MythTV
 #include <libmythbase/mythcorecontext.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythdialogbox.h>
 
 // MythMusic
diff --git a/mythplugins/mythmusic/mythmusic/importsettings.cpp b/mythplugins/mythmusic/mythmusic/importsettings.cpp
index 06632fd3f70..9c61a416a66 100644
--- a/mythplugins/mythmusic/mythmusic/importsettings.cpp
+++ b/mythplugins/mythmusic/mythmusic/importsettings.cpp
@@ -3,6 +3,7 @@
 
 // MythTV
 #include <libmythbase/mythcorecontext.h>
+#include <libmythbase/mythlogging.h>
 
 // MythMusic
 #include "importsettings.h"
diff --git a/mythplugins/mythmusic/mythmusic/lyricsview.cpp b/mythplugins/mythmusic/mythmusic/lyricsview.cpp
index 6498cbc2f4a..1d3d3cd04f8 100644
--- a/mythplugins/mythmusic/mythmusic/lyricsview.cpp
+++ b/mythplugins/mythmusic/mythmusic/lyricsview.cpp
@@ -14,6 +14,7 @@
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>
 #include <libmythbase/mythdownloadmanager.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythversion.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>
diff --git a/mythplugins/mythmusic/mythmusic/mainvisual.cpp b/mythplugins/mythmusic/mythmusic/mainvisual.cpp
index a20d114fb47..164f31af53d 100644
--- a/mythplugins/mythmusic/mythmusic/mainvisual.cpp
+++ b/mythplugins/mythmusic/mythmusic/mainvisual.cpp
@@ -15,6 +15,7 @@
 
 // MythTV
 #include <libmythbase/mythcorecontext.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythuivideo.h>
 
 // mythmusic
diff --git a/mythplugins/mythmusic/mythmusic/miniplayer.cpp b/mythplugins/mythmusic/mythmusic/miniplayer.cpp
index 6c1482ca8ad..b46188ac44b 100644
--- a/mythplugins/mythmusic/mythmusic/miniplayer.cpp
+++ b/mythplugins/mythmusic/mythmusic/miniplayer.cpp
@@ -7,6 +7,7 @@
 
 // MythTV
 #include <libmythbase/lcddevice.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythmainwindow.h>
 
 // mythmusic
diff --git a/mythplugins/mythmusic/mythmusic/musicbrainz.cpp b/mythplugins/mythmusic/mythmusic/musicbrainz.cpp
index 7350ffa56c9..47c8557b360 100644
--- a/mythplugins/mythmusic/mythmusic/musicbrainz.cpp
+++ b/mythplugins/mythmusic/mythmusic/musicbrainz.cpp
@@ -6,6 +6,7 @@
 #include <QFile>
 
 // MythTV
+#include <libmythbase/mythlogging.h>
 #include "libmythbase/mythmiscutil.h"
 
 #ifdef HAVE_MUSICBRAINZ
diff --git a/mythplugins/mythmusic/mythmusic/musiccommon.cpp b/mythplugins/mythmusic/mythmusic/musiccommon.cpp
index e49873dc8b8..fcf0914ec15 100644
--- a/mythplugins/mythmusic/mythmusic/musiccommon.cpp
+++ b/mythplugins/mythmusic/mythmusic/musiccommon.cpp
@@ -11,6 +11,7 @@
 #include <libmythbase/lcddevice.h>
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdate.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythrandom.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythuibutton.h>
diff --git a/mythplugins/mythmusic/mythmusic/musicdata.cpp b/mythplugins/mythmusic/mythmusic/musicdata.cpp
index c5c0e3d5140..9dbf9d7b81d 100644
--- a/mythplugins/mythmusic/mythmusic/musicdata.cpp
+++ b/mythplugins/mythmusic/mythmusic/musicdata.cpp
@@ -7,6 +7,7 @@
 // MythTV
 #include <libmythbase/mthreadpool.h>
 #include <libmythbase/mythcorecontext.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythmetadata/musicfilescanner.h>
 #include <libmythmetadata/musicmetadata.h>
 #include <libmythmetadata/musicutils.h>
diff --git a/mythplugins/mythmusic/mythmusic/musicdbcheck.cpp b/mythplugins/mythmusic/mythmusic/musicdbcheck.cpp
index de0adb58593..dd6ecc9671e 100644
--- a/mythplugins/mythmusic/mythmusic/musicdbcheck.cpp
+++ b/mythplugins/mythmusic/mythmusic/musicdbcheck.cpp
@@ -11,6 +11,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcheck.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythmetadata/musicmetadata.h>
 
 // MythMusic
diff --git a/mythplugins/mythmusic/mythmusic/musicplayer.cpp b/mythplugins/mythmusic/mythmusic/musicplayer.cpp
index b9b09bb542d..4bf20d22b69 100644
--- a/mythplugins/mythmusic/mythmusic/musicplayer.cpp
+++ b/mythplugins/mythmusic/mythmusic/musicplayer.cpp
@@ -13,6 +13,7 @@
 #include <libmythbase/mthreadpool.h>
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythmetadata/metaio.h>
 #include <libmythmetadata/musicutils.h>
 #include <libmythui/mythdialogbox.h>
diff --git a/mythplugins/mythmusic/mythmusic/mythgoom.cpp b/mythplugins/mythmusic/mythmusic/mythgoom.cpp
index 8741c06bc39..25ed078fa7e 100644
--- a/mythplugins/mythmusic/mythmusic/mythgoom.cpp
+++ b/mythplugins/mythmusic/mythmusic/mythgoom.cpp
@@ -13,7 +13,6 @@
 // MythTV
 #include <libmythbase/compat.h>
 #include <libmythbase/mythcorecontext.h>
-#include <libmythbase/mythlogging.h>
 
 // Goom
 #include "libmythtv/visualisations/goom/goom_tools.h"
diff --git a/mythplugins/mythmusic/mythmusic/mythmusic.cpp b/mythplugins/mythmusic/mythmusic/mythmusic.cpp
index de948c4ad57..6c68c367480 100644
--- a/mythplugins/mythmusic/mythmusic/mythmusic.cpp
+++ b/mythplugins/mythmusic/mythmusic/mythmusic.cpp
@@ -16,6 +16,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcon.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythplugin.h>
 #include <libmythbase/mythpluginapi.h>
 #include <libmythbase/mythversion.h>
diff --git a/mythplugins/mythmusic/mythmusic/playersettings.cpp b/mythplugins/mythmusic/mythmusic/playersettings.cpp
index 702c9c7b5fe..4689847861a 100644
--- a/mythplugins/mythmusic/mythmusic/playersettings.cpp
+++ b/mythplugins/mythmusic/mythmusic/playersettings.cpp
@@ -3,6 +3,7 @@
 
 // MythTV
 #include <libmythbase/mythcorecontext.h>
+#include <libmythbase/mythlogging.h>
 
 // MythMusic
 #include "musicplayer.h"
diff --git a/mythplugins/mythmusic/mythmusic/playlist.cpp b/mythplugins/mythmusic/mythmusic/playlist.cpp
index 99772df3529..c89575c8153 100644
--- a/mythplugins/mythmusic/mythmusic/playlist.cpp
+++ b/mythplugins/mythmusic/mythmusic/playlist.cpp
@@ -17,6 +17,7 @@
 #include <libmythbase/exitcodes.h>
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythmiscutil.h>
 #include <libmythbase/mythsystemlegacy.h>
 
diff --git a/mythplugins/mythmusic/mythmusic/playlisteditorview.cpp b/mythplugins/mythmusic/mythmusic/playlisteditorview.cpp
index e528873c19e..220a44084fb 100644
--- a/mythplugins/mythmusic/mythmusic/playlisteditorview.cpp
+++ b/mythplugins/mythmusic/mythmusic/playlisteditorview.cpp
@@ -9,6 +9,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythmetadata/musicutils.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>
diff --git a/mythplugins/mythmusic/mythmusic/playlistview.cpp b/mythplugins/mythmusic/mythmusic/playlistview.cpp
index 84a4df6d767..297de24dc27 100644
--- a/mythplugins/mythmusic/mythmusic/playlistview.cpp
+++ b/mythplugins/mythmusic/mythmusic/playlistview.cpp
@@ -4,6 +4,7 @@
 #include <QKeyEvent>
 
 // MythTV
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythdialogbox.h>
 
 // mythmusic
diff --git a/mythplugins/mythmusic/mythmusic/ratingsettings.cpp b/mythplugins/mythmusic/mythmusic/ratingsettings.cpp
index 117db263473..4661fdec3c7 100644
--- a/mythplugins/mythmusic/mythmusic/ratingsettings.cpp
+++ b/mythplugins/mythmusic/mythmusic/ratingsettings.cpp
@@ -3,6 +3,7 @@
 
 // MythTV
 #include <libmythbase/mythcorecontext.h>
+#include <libmythbase/mythlogging.h>
 
 #include "ratingsettings.h"
 
diff --git a/mythplugins/mythmusic/mythmusic/searchview.cpp b/mythplugins/mythmusic/mythmusic/searchview.cpp
index 73ee568edc4..0bf4071c155 100644
--- a/mythplugins/mythmusic/mythmusic/searchview.cpp
+++ b/mythplugins/mythmusic/mythmusic/searchview.cpp
@@ -6,6 +6,7 @@
 
 // MythTV
 #include <libmythbase/mythdb.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythuibuttonlist.h>
 #include <libmythui/mythuitext.h>
diff --git a/mythplugins/mythmusic/mythmusic/smartplaylist.cpp b/mythplugins/mythmusic/mythmusic/smartplaylist.cpp
index 5a404dbd3d1..b1d3202114d 100644
--- a/mythplugins/mythmusic/mythmusic/smartplaylist.cpp
+++ b/mythplugins/mythmusic/mythmusic/smartplaylist.cpp
@@ -11,6 +11,7 @@
 // MythTV
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdb.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythmetadata/musicmetadata.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>
diff --git a/mythplugins/mythmusic/mythmusic/streamview.cpp b/mythplugins/mythmusic/mythmusic/streamview.cpp
index 9d61c141bc6..123027ab40d 100644
--- a/mythplugins/mythmusic/mythmusic/streamview.cpp
+++ b/mythplugins/mythmusic/mythmusic/streamview.cpp
@@ -14,6 +14,7 @@
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>
 #include <libmythbase/mythdownloadmanager.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythmetadata/musicutils.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>
diff --git a/mythplugins/mythmusic/mythmusic/visualizationsettings.cpp b/mythplugins/mythmusic/mythmusic/visualizationsettings.cpp
index 23972bcfe02..6918a4b86aa 100644
--- a/mythplugins/mythmusic/mythmusic/visualizationsettings.cpp
+++ b/mythplugins/mythmusic/mythmusic/visualizationsettings.cpp
@@ -3,6 +3,7 @@
 
 // MythTV
 #include <libmythbase/mythcorecontext.h>
+#include <libmythbase/mythlogging.h>
 
 #include "visualizationsettings.h"
 
diff --git a/mythplugins/mythmusic/mythmusic/visualize.cpp b/mythplugins/mythmusic/mythmusic/visualize.cpp
index 2ea0a4fddc7..e9dca4ccfe6 100644
--- a/mythplugins/mythmusic/mythmusic/visualize.cpp
+++ b/mythplugins/mythmusic/mythmusic/visualize.cpp
@@ -24,6 +24,7 @@
 // MythTV
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdbcon.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/remotefile.h>
 #include <libmythbase/sizetliteral.h>
 #include <libmythbase/mythdirs.h>
diff --git a/mythplugins/mythmusic/mythmusic/visualizerview.cpp b/mythplugins/mythmusic/mythmusic/visualizerview.cpp
index 2de715d3742..353254c2583 100644
--- a/mythplugins/mythmusic/mythmusic/visualizerview.cpp
+++ b/mythplugins/mythmusic/mythmusic/visualizerview.cpp
@@ -8,6 +8,7 @@
 
 // myth
 #include <libmythbase/mythdbcon.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythmainwindow.h>
 #include <libmythui/mythuibuttonlist.h>
 #include <libmythui/mythuiimage.h>
diff --git a/mythplugins/mythmusic/mythmusic/vorbisencoder.cpp b/mythplugins/mythmusic/mythmusic/vorbisencoder.cpp
index 3a74146e509..4f802f340d1 100644
--- a/mythplugins/mythmusic/mythmusic/vorbisencoder.cpp
+++ b/mythplugins/mythmusic/mythmusic/vorbisencoder.cpp
@@ -11,6 +11,7 @@
 #include <QString>
 
 // MythTV
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythrandom.h>
 #include <libmythmetadata/metaiooggvorbis.h>
 #include <libmythmetadata/musicmetadata.h>
diff --git a/mythplugins/mythnetvision/mythnetvision/netbase.cpp b/mythplugins/mythnetvision/mythnetvision/netbase.cpp
index 9bd77778299..24b1024409b 100644
--- a/mythplugins/mythnetvision/mythnetvision/netbase.cpp
+++ b/mythplugins/mythnetvision/mythnetvision/netbase.cpp
@@ -4,6 +4,7 @@
 #include <libmythbase/mythcoreutil.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/remotefile.h>
 #include <libmythbase/remoteutil.h>
 #include <libmythbase/storagegroup.h>
diff --git a/mythplugins/mythnetvision/mythnetvision/neteditorbase.cpp b/mythplugins/mythnetvision/mythnetvision/neteditorbase.cpp
index 40a91bc90e3..85f1efb0aa6 100644
--- a/mythplugins/mythnetvision/mythnetvision/neteditorbase.cpp
+++ b/mythplugins/mythnetvision/mythnetvision/neteditorbase.cpp
@@ -3,6 +3,7 @@
 // MythTV headers
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/netutils.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>
diff --git a/mythplugins/mythnetvision/mythnetvision/netsearch.cpp b/mythplugins/mythnetvision/mythnetvision/netsearch.cpp
index 57a077adbbe..24f5380de9a 100644
--- a/mythplugins/mythnetvision/mythnetvision/netsearch.cpp
+++ b/mythplugins/mythnetvision/mythnetvision/netsearch.cpp
@@ -10,6 +10,7 @@
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsorthelper.h>
 #include <libmythbase/mythsystemlegacy.h>
 #include <libmythbase/netgrabbermanager.h>
diff --git a/mythplugins/mythnetvision/mythnetvision/nettree.cpp b/mythplugins/mythnetvision/mythnetvision/nettree.cpp
index b92302f1f32..3d62966e833 100644
--- a/mythplugins/mythnetvision/mythnetvision/nettree.cpp
+++ b/mythplugins/mythnetvision/mythnetvision/nettree.cpp
@@ -8,6 +8,7 @@
 #include <libmythbase/mythcoreutil.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsorthelper.h>
 #include <libmythbase/mythsystemlegacy.h>
 #include <libmythbase/netgrabbermanager.h>
diff --git a/mythplugins/mythnetvision/mythnetvision/rsseditor.cpp b/mythplugins/mythnetvision/mythnetvision/rsseditor.cpp
index 8446035d2ae..52cad221e98 100644
--- a/mythplugins/mythnetvision/mythnetvision/rsseditor.cpp
+++ b/mythplugins/mythnetvision/mythnetvision/rsseditor.cpp
@@ -8,6 +8,7 @@
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>
 #include <libmythbase/mythdownloadmanager.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsorthelper.h>
 #include <libmythbase/netutils.h>
 #include <libmythbase/rssparse.h>
diff --git a/mythplugins/mythnews/mythnews/libmythnews.cpp b/mythplugins/mythnews/mythnews/libmythnews.cpp
index a97e0c1439d..4072c7015ce 100644
--- a/mythplugins/mythnews/mythnews/libmythnews.cpp
+++ b/mythplugins/mythnews/mythnews/libmythnews.cpp
@@ -7,6 +7,7 @@
 
 // MythTV headers
 #include <libmythbase/mythcorecontext.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythplugin.h>
 #include <libmythbase/mythpluginapi.h>
 #include <libmythbase/mythversion.h>
diff --git a/mythplugins/mythnews/mythnews/mythnews.cpp b/mythplugins/mythnews/mythnews/mythnews.cpp
index e8a5c9d38cc..c0d2b9a2589 100644
--- a/mythplugins/mythnews/mythnews/mythnews.cpp
+++ b/mythplugins/mythnews/mythnews/mythnews.cpp
@@ -18,6 +18,7 @@
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdirs.h>
 #include <libmythbase/mythdownloadmanager.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsystemlegacy.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>
diff --git a/mythplugins/mythnews/mythnews/mythnewsconfig.cpp b/mythplugins/mythnews/mythnews/mythnewsconfig.cpp
index 7c28ec9b9e5..b930b61fd99 100644
--- a/mythplugins/mythnews/mythnews/mythnewsconfig.cpp
+++ b/mythplugins/mythnews/mythnews/mythnewsconfig.cpp
@@ -6,6 +6,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythmainwindow.h>
 #include <libmythui/mythuibuttonlist.h>
 #include <libmythui/mythuitext.h>
diff --git a/mythplugins/mythnews/mythnews/mythnewseditor.cpp b/mythplugins/mythnews/mythnews/mythnewseditor.cpp
index 065a6d18f88..29369195e2c 100644
--- a/mythplugins/mythnews/mythnews/mythnewseditor.cpp
+++ b/mythplugins/mythnews/mythnews/mythnewseditor.cpp
@@ -2,6 +2,7 @@
 // MythTV headers
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdbcon.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>
 #include <libmythui/mythuibutton.h>
diff --git a/mythplugins/mythnews/mythnews/newsdbcheck.cpp b/mythplugins/mythnews/mythnews/newsdbcheck.cpp
index 11ef44aeb4c..9e150ca1c5c 100644
--- a/mythplugins/mythnews/mythnews/newsdbcheck.cpp
+++ b/mythplugins/mythnews/mythnews/newsdbcheck.cpp
@@ -9,6 +9,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcheck.h>
+#include <libmythbase/mythlogging.h>
 
 // MythNews headers
 #include "newsdbcheck.h"
diff --git a/mythplugins/mythweather/mythweather/mythweather.cpp b/mythplugins/mythweather/mythweather/mythweather.cpp
index ec5034558fb..32257a343f0 100644
--- a/mythplugins/mythweather/mythweather/mythweather.cpp
+++ b/mythplugins/mythweather/mythweather/mythweather.cpp
@@ -4,6 +4,7 @@
 // MythTV headers
 #include <libmythbase/lcddevice.h>
 #include <libmythbase/mythcorecontext.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythplugin.h>
 #include <libmythbase/mythpluginapi.h>
 #include <libmythbase/mythversion.h>
diff --git a/mythplugins/mythweather/mythweather/sourceManager.cpp b/mythplugins/mythweather/mythweather/sourceManager.cpp
index 0d7216cebc8..6ab2db0e3e5 100644
--- a/mythplugins/mythweather/mythweather/sourceManager.cpp
+++ b/mythplugins/mythweather/mythweather/sourceManager.cpp
@@ -11,6 +11,7 @@
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcon.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythprogressdialog.h>
 
 // MythWeather headers
diff --git a/mythplugins/mythweather/mythweather/weather.cpp b/mythplugins/mythweather/mythweather/weather.cpp
index 912bf65c480..8fcb60d6484 100644
--- a/mythplugins/mythweather/mythweather/weather.cpp
+++ b/mythplugins/mythweather/mythweather/weather.cpp
@@ -10,6 +10,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdb.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythuitext.h>
 
 // MythWeather headers
diff --git a/mythplugins/mythweather/mythweather/weatherSetup.cpp b/mythplugins/mythweather/mythweather/weatherSetup.cpp
index a051c5eab3a..6700f59f375 100644
--- a/mythplugins/mythweather/mythweather/weatherSetup.cpp
+++ b/mythplugins/mythweather/mythweather/weatherSetup.cpp
@@ -6,6 +6,7 @@
 // MythTV headers
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythprogressdialog.h>
 
 // MythWeather headers
diff --git a/mythplugins/mythweather/mythweather/weatherSource.cpp b/mythplugins/mythweather/mythweather/weatherSource.cpp
index 24e5c34fcf9..7346d2cffbd 100644
--- a/mythplugins/mythweather/mythweather/weatherSource.cpp
+++ b/mythplugins/mythweather/mythweather/weatherSource.cpp
@@ -18,6 +18,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdirs.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/mythsystemlegacy.h>
 
 // MythWeather headers
diff --git a/mythplugins/mythweather/mythweather/weatherdbcheck.cpp b/mythplugins/mythweather/mythweather/weatherdbcheck.cpp
index b084608fb8f..a713d9f73e3 100644
--- a/mythplugins/mythweather/mythweather/weatherdbcheck.cpp
+++ b/mythplugins/mythweather/mythweather/weatherdbcheck.cpp
@@ -8,6 +8,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdb.h>
 #include <libmythbase/mythdbcheck.h>
+#include <libmythbase/mythlogging.h>
 
 // MythWeather
 #include "weatherdbcheck.h"
diff --git a/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp b/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp
index ed30db5bd46..540d67f65a6 100644
--- a/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp
+++ b/mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp
@@ -25,6 +25,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdbcon.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythmainwindow.h>
 #include <libmythui/mythuitext.h>
 
diff --git a/mythplugins/mythzoneminder/mythzoneminder/zmevents.cpp b/mythplugins/mythzoneminder/mythzoneminder/zmevents.cpp
index d152a2ff005..1be82cea5c0 100644
--- a/mythplugins/mythzoneminder/mythzoneminder/zmevents.cpp
+++ b/mythplugins/mythzoneminder/mythzoneminder/zmevents.cpp
@@ -24,6 +24,7 @@
 #include <libmythbase/mythcorecontext.h>
 #include <libmythbase/mythdate.h>
 #include <libmythbase/mythdbcon.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythui/mythmainwindow.h>
 
 // zoneminder
diff --git a/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp b/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp
index a0481ba5bd4..daaa8f10158 100644
--- a/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp
+++ b/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp
@@ -19,6 +19,7 @@
 
 // MythTV
 #include <libmythbase/mythcorecontext.h>
+#include <libmythbase/mythlogging.h>
 #include <libmythbase/sizetliteral.h>
 #include <libmythui/mythdialogbox.h>
 #include <libmythui/mythmainwindow.h>