diff --git a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
index 2fa5cacebe8..703239fd0e5 100644
--- a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
+++ b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
@@ -1382,7 +1382,7 @@ ChannelScanSM::GetChannelList(transport_scan_items_it_t trans_info,
             for (uint i = 0; i < pat->ProgramCount(); ++i)
             {
                 if ((pat->ProgramNumber(i) == 0) &&
-                    (pat->ProgramPID(i) == SCTE_PSIP_PID))
+                    (pat->ProgramPID(i) == PID::SCTE_PSIP_PID))
                 {
                     could_be_opencable = true;
                 }
diff --git a/mythtv/libs/libmythtv/mpeg/atscstreamdata.cpp b/mythtv/libs/libmythtv/mpeg/atscstreamdata.cpp
index ca637e131c3..3a8cdb350ed 100644
--- a/mythtv/libs/libmythtv/mpeg/atscstreamdata.cpp
+++ b/mythtv/libs/libmythtv/mpeg/atscstreamdata.cpp
@@ -37,8 +37,8 @@ ATSCStreamData::ATSCStreamData(int desiredMajorChannel,
       m_desiredMajorChannel(desiredMajorChannel),
       m_desiredMinorChannel(desiredMinorChannel)
 {
-    AddListeningPID(ATSC_PSIP_PID);
-    AddListeningPID(SCTE_PSIP_PID);
+    AddListeningPID(PID::ATSC_PSIP_PID);
+    AddListeningPID(PID::SCTE_PSIP_PID);
 }
 
 ATSCStreamData::~ATSCStreamData()
@@ -110,8 +110,8 @@ void ATSCStreamData::SetDesiredChannel(int major, int minor)
 void ATSCStreamData::Reset(int desiredProgram)
 {
     MPEGStreamData::Reset(desiredProgram);
-    AddListeningPID(ATSC_PSIP_PID);
-    AddListeningPID(SCTE_PSIP_PID);
+    AddListeningPID(PID::ATSC_PSIP_PID);
+    AddListeningPID(PID::SCTE_PSIP_PID);
 }
 
 void ATSCStreamData::Reset(int desiredMajorChannel, int desiredMinorChannel)
@@ -144,8 +144,8 @@ void ATSCStreamData::Reset(int desiredMajorChannel, int desiredMinorChannel)
         m_cachedCvcts.clear();
     }
 
-    AddListeningPID(ATSC_PSIP_PID);
-    AddListeningPID(SCTE_PSIP_PID);
+    AddListeningPID(PID::ATSC_PSIP_PID);
+    AddListeningPID(PID::SCTE_PSIP_PID);
 }
 
 /** \fn ATSCStreamData::IsRedundant(uint pid, const PSIPTable&) const
diff --git a/mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp b/mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp
index a61e4e107f0..8f7b823fd50 100644
--- a/mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp
+++ b/mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp
@@ -5,14 +5,12 @@
 #include <QSharedPointer>
 #include "dvbstreamdata.h"
 #include "dvbtables.h"
+#include "mpegdescriptors.h"
+#include "mpegtables.h"
 #include "premieretables.h"
 #include "eithelper.h"
 
-#define PREMIERE_ONID 133
-#define FREESAT_EIT_PID 3842
-#define MCA_ONID 6144
 #define MCA_EIT_TSID 136
-#define MCA_EIT_PID 1018
 
 #define LOC QString("DVBStream[%1]: ").arg(m_cardId)
 
@@ -24,9 +22,9 @@ DVBStreamData::DVBStreamData(uint desired_netid,  uint desired_tsid,
 {
     m_nitStatus.SetVersion(-1,0);
     m_nitoStatus.SetVersion(-1,0);
-    AddListeningPID(DVB_NIT_PID);
-    AddListeningPID(DVB_SDT_PID);
-    AddListeningPID(DVB_TDT_PID);
+    AddListeningPID(PID::DVB_NIT_PID);
+    AddListeningPID(PID::DVB_SDT_PID);
+    AddListeningPID(PID::DVB_TDT_PID);
 }
 
 DVBStreamData::~DVBStreamData()
@@ -102,7 +100,7 @@ bool DVBStreamData::IsRedundant(uint pid, const PSIPTable &psip) const
     }
 
     bool is_eit = false;
-    if (DVB_EIT_PID == pid || FREESAT_EIT_PID == pid)
+    if (PID::DVB_EIT_PID == pid || PID::FREESAT_EIT_PID == pid)
     {
         // Standard Now/Next Event Information Tables for this transport
         is_eit |= TableID::PF_EIT  == table_id;
@@ -130,7 +128,7 @@ bool DVBStreamData::IsRedundant(uint pid, const PSIPTable &psip) const
         return m_sdtoStatus.IsSectionSeen(psip.TableIDExtension(), version, psip.Section());
     }
 
-    if (DVB_EIT_PID == pid || FREESAT_EIT_PID == pid || MCA_EIT_PID == pid)
+    if (PID::DVB_EIT_PID == pid || PID::FREESAT_EIT_PID == pid || PID::MCA_EIT_PID == pid)
     {
         // Standard Now/Next Event Information Tables for other transport
         is_eit |= TableID::PF_EITo == table_id;
@@ -138,7 +136,7 @@ bool DVBStreamData::IsRedundant(uint pid, const PSIPTable &psip) const
         is_eit |= (TableID::SC_EITbego <= table_id &&
                    TableID::SC_EITendo >= table_id);
     }
-    if (DVB_DNLONG_EIT_PID == pid || DVB_BVLONG_EIT_PID == pid)
+    if (PID::DVB_DNLONG_EIT_PID == pid || PID::DVB_BVLONG_EIT_PID == pid)
     {
         // Dish Network and Bev Long Term Future Event Information
         // for all transports
@@ -152,7 +150,7 @@ bool DVBStreamData::IsRedundant(uint pid, const PSIPTable &psip) const
         return m_eitStatus.IsSectionSeen(key, version, psip.Section());
     }
 
-    if (((PREMIERE_EIT_DIREKT_PID == pid) || (PREMIERE_EIT_SPORT_PID == pid)) &&
+    if (((PID::PREMIERE_EIT_DIREKT_PID == pid) || (PID::PREMIERE_EIT_SPORT_PID == pid)) &&
         TableID::PREMIERE_CIT == table_id)
     {
         uint content_id = PremiereContentInformationTable(psip).ContentID();
@@ -196,9 +194,9 @@ void DVBStreamData::Reset(uint desired_netid, uint desired_tsid,
 
         m_cacheLock.unlock();
     }
-    AddListeningPID(DVB_NIT_PID);
-    AddListeningPID(DVB_SDT_PID);
-    AddListeningPID(DVB_TDT_PID);
+    AddListeningPID(PID::DVB_NIT_PID);
+    AddListeningPID(PID::DVB_SDT_PID);
+    AddListeningPID(PID::DVB_TDT_PID);
 }
 
 /** \fn DVBStreamData::HandleTables(uint pid, const PSIPTable&)
@@ -363,9 +361,9 @@ bool DVBStreamData::HandleTables(uint pid, const PSIPTable &psip)
         }
     }
 
-    if ((DVB_EIT_PID == pid || DVB_DNLONG_EIT_PID == pid || FREESAT_EIT_PID == pid ||
-        ((MCA_ONID == m_desiredNetId) && (MCA_EIT_TSID == m_desiredTsId) &&
-        (MCA_EIT_PID == pid)) || DVB_BVLONG_EIT_PID == pid) &&
+    if ((PID::DVB_EIT_PID == pid || PID::DVB_DNLONG_EIT_PID == pid || PID::FREESAT_EIT_PID == pid ||
+        ((OriginalNetworkID::MCA == m_desiredNetId) && (MCA_EIT_TSID == m_desiredTsId) &&
+        (PID::MCA_EIT_PID == pid)) || PID::DVB_BVLONG_EIT_PID == pid) &&
 
         DVBEventInformationTable::IsEIT(psip.TableID()))
     {
@@ -388,8 +386,8 @@ bool DVBStreamData::HandleTables(uint pid, const PSIPTable &psip)
         return true;
     }
 
-    if (m_desiredNetId == PREMIERE_ONID &&
-        (PREMIERE_EIT_DIREKT_PID == pid || PREMIERE_EIT_SPORT_PID == pid) &&
+    if (m_desiredNetId == OriginalNetworkID::PREMIERE &&
+        (PID::PREMIERE_EIT_DIREKT_PID == pid || PID::PREMIERE_EIT_SPORT_PID == pid) &&
         PremiereContentInformationTable::IsEIT(psip.TableID()))
     {
         QMutexLocker locker(&m_listenerLock);
@@ -450,36 +448,36 @@ bool DVBStreamData::GetEITPIDChanges(const uint_vec_t &cur_pids,
     if ((m_eitRate >= 0.5F) && HasAnyEIT())
     {
         if (find(cur_pids.begin(), cur_pids.end(),
-                 (uint) DVB_EIT_PID) == cur_pids.end())
+                 (uint) PID::DVB_EIT_PID) == cur_pids.end())
         {
-            add_pids.push_back(DVB_EIT_PID);
+            add_pids.push_back(PID::DVB_EIT_PID);
         }
 
         if (m_dvbEitDishnetLong &&
             find(cur_pids.begin(), cur_pids.end(),
-                 (uint) DVB_DNLONG_EIT_PID) == cur_pids.end())
+                 (uint) PID::DVB_DNLONG_EIT_PID) == cur_pids.end())
         {
-            add_pids.push_back(DVB_DNLONG_EIT_PID);
+            add_pids.push_back(PID::DVB_DNLONG_EIT_PID);
         }
 
         if (m_dvbEitDishnetLong &&
             find(cur_pids.begin(), cur_pids.end(),
-                 (uint) DVB_BVLONG_EIT_PID) == cur_pids.end())
+                 (uint) PID::DVB_BVLONG_EIT_PID) == cur_pids.end())
         {
-            add_pids.push_back(DVB_BVLONG_EIT_PID);
+            add_pids.push_back(PID::DVB_BVLONG_EIT_PID);
         }
 
 #if 0
         // OpenTV EIT pids
         if (m_dvbEitDishnetLong)
         {
-            for (uint pid = OTV_EIT_TIT_PID_START; pid <= OTV_EIT_TIT_PID_END; pid++)
+            for (uint pid = PID::OTV_EIT_TIT_PID_START; pid <= PID::OTV_EIT_TIT_PID_END; pid++)
             {
                 if (find(cur_pids.begin(), cur_pids.end(),
                          pid) == cur_pids.end())
                     add_pids.push_back(pid);
             }
-            for (uint pid = OTV_EIT_SUP_PID_START; pid <= OTV_EIT_SUP_PID_END; pid++)
+            for (uint pid = PID::OTV_EIT_SUP_PID_START; pid <= PID::OTV_EIT_SUP_PID_END; pid++)
             {
                 if (find(cur_pids.begin(), cur_pids.end(),
                          pid) == cur_pids.end())
@@ -488,67 +486,67 @@ bool DVBStreamData::GetEITPIDChanges(const uint_vec_t &cur_pids,
         }
 #endif
 
-        if (m_desiredNetId == PREMIERE_ONID &&
+        if (m_desiredNetId == OriginalNetworkID::PREMIERE &&
             find(cur_pids.begin(), cur_pids.end(),
-                 (uint) PREMIERE_EIT_DIREKT_PID) == cur_pids.end())
+                 (uint) PID::PREMIERE_EIT_DIREKT_PID) == cur_pids.end())
         {
-            add_pids.push_back(PREMIERE_EIT_DIREKT_PID);
+            add_pids.push_back(PID::PREMIERE_EIT_DIREKT_PID);
         }
 
-        if (m_desiredNetId == PREMIERE_ONID &&
+        if (m_desiredNetId == OriginalNetworkID::PREMIERE &&
             find(cur_pids.begin(), cur_pids.end(),
-                 (uint) PREMIERE_EIT_SPORT_PID) == cur_pids.end())
+                 (uint) PID::PREMIERE_EIT_SPORT_PID) == cur_pids.end())
         {
-            add_pids.push_back(PREMIERE_EIT_SPORT_PID);
+            add_pids.push_back(PID::PREMIERE_EIT_SPORT_PID);
         }
 
         if (find(cur_pids.begin(), cur_pids.end(),
-                 (uint) FREESAT_EIT_PID) == cur_pids.end())
+                 (uint) PID::FREESAT_EIT_PID) == cur_pids.end())
         {
-            add_pids.push_back(FREESAT_EIT_PID);
+            add_pids.push_back(PID::FREESAT_EIT_PID);
         }
 
-        if (MCA_ONID == m_desiredNetId && MCA_EIT_TSID == m_desiredTsId &&
+        if (OriginalNetworkID::MCA == m_desiredNetId && MCA_EIT_TSID == m_desiredTsId &&
             find(cur_pids.begin(), cur_pids.end(),
-                 (uint) MCA_EIT_PID) == cur_pids.end())
+                 (uint) PID::MCA_EIT_PID) == cur_pids.end())
         {
-            add_pids.push_back(MCA_EIT_PID);
+            add_pids.push_back(PID::MCA_EIT_PID);
         }
 
     }
     else
     {
         if (find(cur_pids.begin(), cur_pids.end(),
-                 (uint) DVB_EIT_PID) != cur_pids.end())
+                 (uint) PID::DVB_EIT_PID) != cur_pids.end())
         {
-            del_pids.push_back(DVB_EIT_PID);
+            del_pids.push_back(PID::DVB_EIT_PID);
         }
 
         if (m_dvbEitDishnetLong &&
             find(cur_pids.begin(), cur_pids.end(),
-                 (uint) DVB_DNLONG_EIT_PID) != cur_pids.end())
+                 (uint) PID::DVB_DNLONG_EIT_PID) != cur_pids.end())
         {
-            del_pids.push_back(DVB_DNLONG_EIT_PID);
+            del_pids.push_back(PID::DVB_DNLONG_EIT_PID);
         }
 
         if (m_dvbEitDishnetLong &&
             find(cur_pids.begin(), cur_pids.end(),
-                 (uint) DVB_BVLONG_EIT_PID) != cur_pids.end())
+                 (uint) PID::DVB_BVLONG_EIT_PID) != cur_pids.end())
         {
-            del_pids.push_back(DVB_BVLONG_EIT_PID);
+            del_pids.push_back(PID::DVB_BVLONG_EIT_PID);
         }
 
 #if 0
         // OpenTV EIT pids
         if (m_dvbEitDishnetLong)
         {
-            for (uint pid = OTV_EIT_TIT_PID_START; pid <= OTV_EIT_TIT_PID_END; pid++)
+            for (uint pid = PID::OTV_EIT_TIT_PID_START; pid <= PID::OTV_EIT_TIT_PID_END; pid++)
             {
                 if (find(cur_pids.begin(), cur_pids.end(),
                          pid) != cur_pids.end())
                     del_pids.push_back(pid);
             }
-            for(uint pid=OTV_EIT_SUP_PID_START; pid <= OTV_EIT_SUP_PID_END; pid++)
+            for(uint pid=PID::OTV_EIT_SUP_PID_START; pid <= PID::OTV_EIT_SUP_PID_END; pid++)
             {
                 if (find(cur_pids.begin(), cur_pids.end(),
                          pid) != cur_pids.end())
@@ -557,31 +555,31 @@ bool DVBStreamData::GetEITPIDChanges(const uint_vec_t &cur_pids,
         }
 #endif
 
-        if (m_desiredNetId == PREMIERE_ONID &&
+        if (m_desiredNetId == OriginalNetworkID::PREMIERE &&
             find(cur_pids.begin(), cur_pids.end(),
-                 (uint) PREMIERE_EIT_DIREKT_PID) != cur_pids.end())
+                 (uint) PID::PREMIERE_EIT_DIREKT_PID) != cur_pids.end())
         {
-            del_pids.push_back(PREMIERE_EIT_DIREKT_PID);
+            del_pids.push_back(PID::PREMIERE_EIT_DIREKT_PID);
         }
 
-        if (m_desiredNetId == PREMIERE_ONID &&
+        if (m_desiredNetId == OriginalNetworkID::PREMIERE &&
             find(cur_pids.begin(), cur_pids.end(),
-                 (uint) PREMIERE_EIT_SPORT_PID) != cur_pids.end())
+                 (uint) PID::PREMIERE_EIT_SPORT_PID) != cur_pids.end())
         {
-            del_pids.push_back(PREMIERE_EIT_SPORT_PID);
+            del_pids.push_back(PID::PREMIERE_EIT_SPORT_PID);
         }
 
         if (find(cur_pids.begin(), cur_pids.end(),
-                 (uint) FREESAT_EIT_PID) != cur_pids.end())
+                 (uint) PID::FREESAT_EIT_PID) != cur_pids.end())
         {
-            del_pids.push_back(FREESAT_EIT_PID);
+            del_pids.push_back(PID::FREESAT_EIT_PID);
         }
 
-        if (MCA_ONID == m_desiredNetId && MCA_EIT_TSID == m_desiredTsId &&
+        if (OriginalNetworkID::MCA == m_desiredNetId && MCA_EIT_TSID == m_desiredTsId &&
             find(cur_pids.begin(), cur_pids.end(),
-                 (uint) MCA_EIT_PID) != cur_pids.end())
+                 (uint) PID::MCA_EIT_PID) != cur_pids.end())
         {
-            del_pids.push_back(MCA_EIT_PID);
+            del_pids.push_back(PID::MCA_EIT_PID);
         }
     }
 
diff --git a/mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp b/mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp
index 99cbe9ac47e..e3b52458b96 100644
--- a/mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp
+++ b/mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp
@@ -43,8 +43,8 @@ MPEGStreamData::MPEGStreamData(int desiredProgram, int cardnum,
       // Single program stuff
       m_desiredProgram(desiredProgram)
 {
-    MPEGStreamData::AddListeningPID(MPEG_PAT_PID);
-    MPEGStreamData::AddListeningPID(MPEG_CAT_PID);
+    MPEGStreamData::AddListeningPID(PID::MPEG_PAT_PID);
+    MPEGStreamData::AddListeningPID(PID::MPEG_CAT_PID);
 }
 
 MPEGStreamData::~MPEGStreamData()
@@ -165,8 +165,8 @@ void MPEGStreamData::Reset(int desiredProgram)
 
     ResetDecryptionMonitoringState();
 
-    AddListeningPID(MPEG_PAT_PID);
-    AddListeningPID(MPEG_CAT_PID);
+    AddListeningPID(PID::MPEG_PAT_PID);
+    AddListeningPID(PID::MPEG_CAT_PID);
 }
 
 void MPEGStreamData::DeletePartialPSIP(uint pid)
diff --git a/mythtv/libs/libmythtv/mpeg/mpegtables.cpp b/mythtv/libs/libmythtv/mpeg/mpegtables.cpp
index 6329e396f0c..c45f1dafa1d 100644
--- a/mythtv/libs/libmythtv/mpeg/mpegtables.cpp
+++ b/mythtv/libs/libmythtv/mpeg/mpegtables.cpp
@@ -736,20 +736,20 @@ uint ProgramMapTable::FindPIDs(uint           type,
 uint ProgramMapTable::FindUnusedPID(uint desired_pid) const
 {
     uint pid = desired_pid;
-    if (pid >= MPEG_NULL_PID)
+    if (pid >= PID::MPEG_NULL_PID)
         pid = 0x20;
 
     while (FindPID(pid) != -1)
         pid += 0x10;
 
-    if (pid < MPEG_NULL_PID)
+    if (pid < PID::MPEG_NULL_PID)
         return pid;
 
     pid = desired_pid;
     while (FindPID(pid) != -1)
         pid += 1;
 
-    if (pid < MPEG_NULL_PID)
+    if (pid < PID::MPEG_NULL_PID)
         return pid;
 
     pid = 0x20;
diff --git a/mythtv/libs/libmythtv/mpeg/mpegtables.h b/mythtv/libs/libmythtv/mpeg/mpegtables.h
index 79acb05b0d6..dbde6f4d3f0 100644
--- a/mythtv/libs/libmythtv/mpeg/mpegtables.h
+++ b/mythtv/libs/libmythtv/mpeg/mpegtables.h
@@ -200,46 +200,57 @@ class MTV_PUBLIC StreamID
     static QString GetDescription(uint stream_id);
 };
 
-enum
+/** \class PID
+ *  \brief Contains Packet Identifier numeric values.
+ */
+class MTV_PUBLIC PID
 {
-    MPEG_PAT_PID  = 0x0000,
-    MPEG_CAT_PID  = 0x0001,
-    MPEG_TSDT_PID = 0x0002,
+  public:
+    enum
+    {
+        MPEG_PAT_PID  = 0x0000,
+        MPEG_CAT_PID  = 0x0001,
+        MPEG_TSDT_PID = 0x0002,
 
-    DVB_NIT_PID   = 0x0010,
-    DVB_SDT_PID   = 0x0011,
-    DVB_EIT_PID   = 0x0012,
-    DVB_RST_PID   = 0x0013,
-    DVB_TDT_PID   = 0x0014,
+        DVB_NIT_PID   = 0x0010,
+        DVB_SDT_PID   = 0x0011,
+        DVB_EIT_PID   = 0x0012,
+        DVB_RST_PID   = 0x0013,
+        DVB_TDT_PID   = 0x0014,
 
-    // Dishnet longterm EIT is on pid 0x300
-    DVB_DNLONG_EIT_PID = 0x0300,
+        // Dishnet longterm EIT is on pid 0x300
+        DVB_DNLONG_EIT_PID = 0x0300,
 
-    // Bell longterm EIT is on pid 0x441
-    DVB_BVLONG_EIT_PID = 0x0441,
+        // Bell longterm EIT is on pid 0x441
+        DVB_BVLONG_EIT_PID = 0x0441,
 
-    // Premiere EIT for Direkt/Sport PPV
-    PREMIERE_EIT_DIREKT_PID = 0x0b11,
-    PREMIERE_EIT_SPORT_PID  = 0x0b12,
+        // MCA
+        MCA_EIT_PID        = 0x03fa,    // 1018
 
-    ATSC_PSIP_PID = 0x1ffb,
+        // Premiere EIT for Direkt/Sport PPV
+        PREMIERE_EIT_DIREKT_PID = 0x0b11,
+        PREMIERE_EIT_SPORT_PID  = 0x0b12,
 
-    SCTE_PSIP_PID = 0x1ffc,
 
-    // UK Freesat PIDs: SDTo/BAT, longterm EIT, shortterm EIT
-    FREESAT_SI_PID     = 0x0f01,
-    FREESAT_EIT_PID    = 0x0f02,
-    FREESAT_ST_EIT_PID = 0x0f03,
+        ATSC_PSIP_PID = 0x1ffb,
 
-    /// The all-ones PID value 0x1FFF indicates a Null TS Packet
-    /// introduced to maintain a constant bit rate of a TS Multiplex.
-    MPEG_NULL_PID      = 0x1fff,
+        SCTE_PSIP_PID = 0x1ffc,
 
-    // OpenTV EIT PIDs
-    OTV_EIT_TIT_PID_START  = 0x30,
-    OTV_EIT_TIT_PID_END    = 0x37,
-    OTV_EIT_SUP_PID_START  = 0x40,
-    OTV_EIT_SUP_PID_END    = 0x47,
+        // UK Freesat PIDs: SDTo/BAT, longterm EIT, shortterm EIT
+        FREESAT_SI_PID     = 0x0f01,
+        FREESAT_EIT_PID    = 0x0f02,    // 3842
+        FREESAT_ST_EIT_PID = 0x0f03,
+
+        /// The all-ones PID value 0x1FFF indicates a Null TS Packet
+        /// introduced to maintain a constant bit rate of a TS Multiplex.
+        MPEG_NULL_PID      = 0x1fff,
+
+        // OpenTV EIT PIDs
+        OTV_EIT_TIT_PID_START  = 0x30,
+        OTV_EIT_TIT_PID_END    = 0x37,
+        OTV_EIT_SUP_PID_START  = 0x40,
+        OTV_EIT_SUP_PID_END    = 0x47,
+    };
 };
 
 /** \class TableID
diff --git a/mythtv/libs/libmythtv/mpeg/scanstreamdata.cpp b/mythtv/libs/libmythtv/mpeg/scanstreamdata.cpp
index c547a0c12a7..6ae2c60201e 100644
--- a/mythtv/libs/libmythtv/mpeg/scanstreamdata.cpp
+++ b/mythtv/libs/libmythtv/mpeg/scanstreamdata.cpp
@@ -38,21 +38,21 @@ bool ScanStreamData::HandleTables(uint pid, const PSIPTable &psip)
 void ScanStreamData::AddAllListeningPIDs(void)
 {
     // MPEG
-    AddListeningPID(MPEG_PAT_PID);
-    AddListeningPID(MPEG_CAT_PID);
+    AddListeningPID(PID::MPEG_PAT_PID);
+    AddListeningPID(PID::MPEG_CAT_PID);
 
     // ATSC
-    AddListeningPID(ATSC_PSIP_PID);
-    AddListeningPID(SCTE_PSIP_PID);
+    AddListeningPID(PID::ATSC_PSIP_PID);
+    AddListeningPID(PID::SCTE_PSIP_PID);
 
     // DVB
-    AddListeningPID(DVB_NIT_PID);
-    AddListeningPID(DVB_SDT_PID);
-    AddListeningPID(DVB_TDT_PID);
+    AddListeningPID(PID::DVB_NIT_PID);
+    AddListeningPID(PID::DVB_SDT_PID);
+    AddListeningPID(PID::DVB_TDT_PID);
 
     // Extra
     if (m_dvbUkFreesatSi)
-        AddListeningPID(FREESAT_SI_PID);
+        AddListeningPID(PID::FREESAT_SI_PID);
 }
 
 void ScanStreamData::Reset(void)
diff --git a/mythtv/libs/libmythtv/mpeg/scanstreamdata.h b/mythtv/libs/libmythtv/mpeg/scanstreamdata.h
index 4c1f8be259f..244ce17c27f 100644
--- a/mythtv/libs/libmythtv/mpeg/scanstreamdata.h
+++ b/mythtv/libs/libmythtv/mpeg/scanstreamdata.h
@@ -47,9 +47,9 @@ inline void ScanStreamData::SetFreesatAdditionalSI(bool freesat_si)
     QMutexLocker locker(&m_listenerLock);
     m_dvbUkFreesatSi = freesat_si;
     if (freesat_si)
-        AddListeningPID(FREESAT_SI_PID);
+        AddListeningPID(PID::FREESAT_SI_PID);
     else
-        RemoveListeningPID(FREESAT_SI_PID);
+        RemoveListeningPID(PID::FREESAT_SI_PID);
 }
 
 #endif // SCANSTREAMDATA_H_
diff --git a/mythtv/libs/libmythtv/recorders/ExternalRecorder.cpp b/mythtv/libs/libmythtv/recorders/ExternalRecorder.cpp
index 9f4f742bd15..1145bf91478 100644
--- a/mythtv/libs/libmythtv/recorders/ExternalRecorder.cpp
+++ b/mythtv/libs/libmythtv/recorders/ExternalRecorder.cpp
@@ -69,7 +69,7 @@ void ExternalRecorder::run(void)
         const ProgramAssociationTable *pat = m_channel->GetGeneratedPAT();
         const ProgramMapTable         *pmt = m_channel->GetGeneratedPMT();
         m_streamData->Reset(pat->ProgramNumber(0));
-        m_streamData->HandleTables(MPEG_PAT_PID, *pat);
+        m_streamData->HandleTables(PID::MPEG_PAT_PID, *pat);
         m_streamData->HandleTables(pat->ProgramPID(0), *pmt);
         LOG(VB_GENERAL, LOG_INFO, LOC + "PMT set");
     }
diff --git a/mythtv/libs/libmythtv/recorders/asirecorder.cpp b/mythtv/libs/libmythtv/recorders/asirecorder.cpp
index 330d2a4fcc4..7f31adc37f5 100644
--- a/mythtv/libs/libmythtv/recorders/asirecorder.cpp
+++ b/mythtv/libs/libmythtv/recorders/asirecorder.cpp
@@ -109,13 +109,13 @@ void ASIRecorder::run(void)
         const ProgramAssociationTable *pat = m_channel->GetGeneratedPAT();
         const ProgramMapTable         *pmt = m_channel->GetGeneratedPMT();
         m_streamData->Reset(pat->ProgramNumber(0));
-        m_streamData->HandleTables(MPEG_PAT_PID, *pat);
+        m_streamData->HandleTables(PID::MPEG_PAT_PID, *pat);
         m_streamData->HandleTables(pat->ProgramPID(0), *pmt);
     }
 
     // Listen for time table on DVB standard streams
     if (m_channel && (m_channel->GetSIStandard() == "dvb"))
-        m_streamData->AddListeningPID(DVB_TDT_PID);
+        m_streamData->AddListeningPID(PID::DVB_TDT_PID);
 
     StartNewFile();
 
diff --git a/mythtv/libs/libmythtv/recorders/dtvsignalmonitor.cpp b/mythtv/libs/libmythtv/recorders/dtvsignalmonitor.cpp
index 29771a9edb2..7004a5b0a83 100644
--- a/mythtv/libs/libmythtv/recorders/dtvsignalmonitor.cpp
+++ b/mythtv/libs/libmythtv/recorders/dtvsignalmonitor.cpp
@@ -251,7 +251,7 @@ void DTVSignalMonitor::SetDVBService(uint network_id, uint transport_id, int ser
     {
         dvb->SetDesiredService(network_id, transport_id, m_programNumber);
         AddFlags(kDTVSigMon_WaitForPMT | kDTVSigMon_WaitForSDT);
-        dvb->AddListeningPID(DVB_SDT_PID);
+        dvb->AddListeningPID(PID::DVB_SDT_PID);
     }
 }
 
diff --git a/mythtv/libs/libmythtv/recorders/dvbrecorder.cpp b/mythtv/libs/libmythtv/recorders/dvbrecorder.cpp
index 341ac5fb4f8..b4cc2b9467c 100644
--- a/mythtv/libs/libmythtv/recorders/dvbrecorder.cpp
+++ b/mythtv/libs/libmythtv/recorders/dvbrecorder.cpp
@@ -115,7 +115,7 @@ void DVBRecorder::run(void)
 
     // Listen for time table on DVB standard streams
     if (m_channel && (m_channel->GetSIStandard() == "dvb"))
-        m_streamData->AddListeningPID(DVB_TDT_PID);
+        m_streamData->AddListeningPID(PID::DVB_TDT_PID);
     if (m_recordMptsOnly)
         m_streamData->AddListeningPID(0x2000);
 
diff --git a/mythtv/libs/libmythtv/recorders/dvbsignalmonitor.cpp b/mythtv/libs/libmythtv/recorders/dvbsignalmonitor.cpp
index ff9c9d51432..d7a51be04be 100644
--- a/mythtv/libs/libmythtv/recorders/dvbsignalmonitor.cpp
+++ b/mythtv/libs/libmythtv/recorders/dvbsignalmonitor.cpp
@@ -332,7 +332,7 @@ void DVBSignalMonitor::UpdateValues(void)
             m_uncorrectedBlocks.SetValue(ublocks);
     }
 
-    // Debug output
+    // Signal lock change
     if (wasLocked != isLocked)
     {
         LOG(VB_CHANNEL, LOG_INFO, LOC + "UpdateValues -- Signal " +
@@ -351,7 +351,7 @@ void DVBSignalMonitor::UpdateValues(void)
                    kDTVSigMon_WaitForMGT | kDTVSigMon_WaitForVCT |
                    kDTVSigMon_WaitForNIT | kDTVSigMon_WaitForSDT))
     {
-        GetStreamData()->AddListeningPID(MPEG_PAT_PID);
+        GetStreamData()->AddListeningPID(PID::MPEG_PAT_PID);
         m_streamHandler->AddListener(GetStreamData(), true, false);
         m_streamHandlerStarted = true;
     }
diff --git a/mythtv/libs/libmythtv/recorders/hdhrrecorder.cpp b/mythtv/libs/libmythtv/recorders/hdhrrecorder.cpp
index d4218ae8f8c..8a50f526125 100644
--- a/mythtv/libs/libmythtv/recorders/hdhrrecorder.cpp
+++ b/mythtv/libs/libmythtv/recorders/hdhrrecorder.cpp
@@ -94,7 +94,7 @@ void HDHRRecorder::run(void)
 
     // Listen for time table on DVB standard streams
     if (m_channel && (m_channel->GetSIStandard() == "dvb"))
-        m_streamData->AddListeningPID(DVB_TDT_PID);
+        m_streamData->AddListeningPID(PID::DVB_TDT_PID);
 
     // Gives errors about invalid PID but it does work...
     if (m_recordMptsOnly)
diff --git a/mythtv/libs/libmythtv/recorders/satiprecorder.cpp b/mythtv/libs/libmythtv/recorders/satiprecorder.cpp
index fe887e62260..c4d2360e8f7 100644
--- a/mythtv/libs/libmythtv/recorders/satiprecorder.cpp
+++ b/mythtv/libs/libmythtv/recorders/satiprecorder.cpp
@@ -90,7 +90,7 @@ void SatIPRecorder::run(void)
 
     // Listen for time table on DVB standard streams
     if (m_channel && (m_channel->GetSIStandard() == "dvb"))
-        m_streamData->AddListeningPID(DVB_TDT_PID);
+        m_streamData->AddListeningPID(PID::DVB_TDT_PID);
     if (m_recordMptsOnly)
         m_streamData->AddListeningPID(0x2000);
 
diff --git a/mythtv/libs/libmythtv/recorders/v4l2encrecorder.cpp b/mythtv/libs/libmythtv/recorders/v4l2encrecorder.cpp
index 814834560b4..2273ea2500d 100644
--- a/mythtv/libs/libmythtv/recorders/v4l2encrecorder.cpp
+++ b/mythtv/libs/libmythtv/recorders/v4l2encrecorder.cpp
@@ -157,7 +157,7 @@ void V4L2encRecorder::run(void)
         const ProgramAssociationTable *pat = m_channel->GetGeneratedPAT();
         const ProgramMapTable         *pmt = m_channel->GetGeneratedPMT();
         m_streamData->Reset(pat->ProgramNumber(0));
-        m_streamData->HandleTables(MPEG_PAT_PID, *pat);
+        m_streamData->HandleTables(PID::MPEG_PAT_PID, *pat);
         m_streamData->HandleTables(pat->ProgramPID(0), *pmt);
         LOG(VB_GENERAL, LOG_INFO, LOC + "PMT set"); // debugging
     }
diff --git a/mythtv/programs/mythutil/mpegutils.cpp b/mythtv/programs/mythutil/mpegutils.cpp
index acf93e980d8..d81e1ed15d9 100644
--- a/mythtv/programs/mythutil/mpegutils.cpp
+++ b/mythtv/programs/mythutil/mpegutils.cpp
@@ -440,12 +440,12 @@ class PrintMPEGStreamListener : public MPEGStreamListener, public PrintOutput
         m_autopts(autopts), m_sd(sd), m_usePid(use_pid)
     {
         if (m_autopts)
-            m_sd->AddListeningPID(MPEG_PAT_PID);
+            m_sd->AddListeningPID(PID::MPEG_PAT_PID);
     }
 
     void HandlePAT(const ProgramAssociationTable *pat) override // MPEGStreamListener
     {
-        if (pat && (!m_autopts || m_usePid[MPEG_PAT_PID]))
+        if (pat && (!m_autopts || m_usePid[PID::MPEG_PAT_PID]))
             Output(pat);
         if (pat && m_autopts)
         {