Index: libs/libmythtv/cardutil.h
===================================================================
--- libs/libmythtv/cardutil.h	(revision 20430)
+++ libs/libmythtv/cardutil.h	(working copy)
@@ -18,7 +18,7 @@
 typedef QMap<int,QString> InputNames;
 typedef vector<QString>   QStringVec;
 
-QString get_on_cardid(const QString&, uint);
+MPUBLIC QString get_on_cardid(const QString&, uint);
 
 bool set_on_source(const QString&, uint, uint, const QString);
 
Index: libs/libmythtv/channelscan/scaninfo.h
===================================================================
--- libs/libmythtv/channelscan/scaninfo.h	(revision 20430)
+++ libs/libmythtv/channelscan/scaninfo.h	(working copy)
@@ -14,6 +14,7 @@
 #include <qdatetime.h>
 
 // MythTV headers
+#include "mythexp.h"
 #include "dtvmultiplex.h"
 
 class ScanInfo
@@ -34,8 +35,8 @@
     QDateTime scandate;
 };
 
-vector<ScanInfo> LoadScanList(void);
+MPUBLIC vector<ScanInfo> LoadScanList(void);
 uint SaveScan(const ScanDTVTransportList &scan);
-ScanDTVTransportList LoadScan(uint scanid);
+MPUBLIC ScanDTVTransportList LoadScan(uint scanid);
 
 #endif // _CHANNEL_IMPORTER_HELPERS_H_
Index: libs/libmythtv/channelscan/channelimporter.h
===================================================================
--- libs/libmythtv/channelscan/channelimporter.h	(revision 20430)
+++ libs/libmythtv/channelscan/channelimporter.h	(working copy)
@@ -64,7 +64,7 @@
     uint max_atscmajcnt;
 };
 
-class ChannelImporter
+class MPUBLIC ChannelImporter
 {
   public:
     ChannelImporter(bool gui, bool interactive, bool insert, bool save) :
Index: libs/libmythtv/channelscan/channelscanner.h
===================================================================
--- libs/libmythtv/channelscan/channelscanner.h	(revision 20430)
+++ libs/libmythtv/channelscan/channelscanner.h	(working copy)
@@ -31,6 +31,7 @@
 #define _CHANNEL_SCANNER_H_
 
 // MythTV headers
+#include "mythexp.h"
 #include "dtvconfparser.h"
 #include "scanmonitor.h"
 
@@ -39,7 +40,7 @@
 class ChannelScanSM;
 class ChannelBase;
 
-class ChannelScanner
+class MPUBLIC ChannelScanner
 {
     friend class ScanMonitor;
 
Index: libs/libmythtv/channelscan/channelscanner_cli.h
===================================================================
--- libs/libmythtv/channelscan/channelscanner_cli.h	(revision 20430)
+++ libs/libmythtv/channelscan/channelscanner_cli.h	(working copy)
@@ -40,7 +40,7 @@
 #include "settings.h"
 #include "channelscanner.h"
 
-class ChannelScannerCLI : public ChannelScanner
+class MPUBLIC ChannelScannerCLI : public ChannelScanner
 {
   public:
     ChannelScannerCLI(bool doScanSaveOnly, bool promptsOk);