diff --git a/3rdparty/libmygpo-qt/AddRemoveResult.h b/3rdparty/libmygpo-qt/AddRemoveResult.h
index 0dc08e818..e2034dcd5 100644
--- a/3rdparty/libmygpo-qt/AddRemoveResult.h
+++ b/3rdparty/libmygpo-qt/AddRemoveResult.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef ADDREMOVERESULT_H
-#define ADDREMOVERESULT_H
+#ifndef LIBMYGPO_QT_ADDREMOVERESULT_H
+#define LIBMYGPO_QT_ADDREMOVERESULT_H
 
 #include <QList>
 #include <QVariant>
@@ -67,4 +67,4 @@ typedef QSharedPointer<AddRemoveResult> AddRemoveResultPtr;
 
 Q_DECLARE_METATYPE( mygpo::AddRemoveResultPtr );
 
-#endif // ADDREMOVERESULT_H
+#endif // LIBMYGPO_QT_ADDREMOVERESULT_H
diff --git a/3rdparty/libmygpo-qt/ApiRequest.h b/3rdparty/libmygpo-qt/ApiRequest.h
index 0b33949d9..e56feecd2 100644
--- a/3rdparty/libmygpo-qt/ApiRequest.h
+++ b/3rdparty/libmygpo-qt/ApiRequest.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef APIREQUEST_H
-#define APIREQUEST_H
+#ifndef LIBMYGPO_QT_APIREQUEST_H
+#define LIBMYGPO_QT_APIREQUEST_H
 
 #define MYGPO_MAJOR_VERSION 1
 #define MYGPO_MINOR_VERSION 0
diff --git a/3rdparty/libmygpo-qt/Device.h b/3rdparty/libmygpo-qt/Device.h
index fb687c397..c1874a433 100644
--- a/3rdparty/libmygpo-qt/Device.h
+++ b/3rdparty/libmygpo-qt/Device.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef DEVICE_H
-#define DEVICE_H
+#ifndef LIBMYGPO_QT_DEVICE_H
+#define LIBMYGPO_QT_DEVICE_H
 
 #include "mygpo_export.h"
 
@@ -68,4 +68,4 @@ typedef QSharedPointer<Device> DevicePtr;
 
 Q_DECLARE_METATYPE( mygpo::DevicePtr );
 
-#endif //DEVICE_H
+#endif //LIBMYGPO_QT_DEVICE_H
diff --git a/3rdparty/libmygpo-qt/DeviceList.h b/3rdparty/libmygpo-qt/DeviceList.h
index 6d7539ff7..c5c7c819b 100644
--- a/3rdparty/libmygpo-qt/DeviceList.h
+++ b/3rdparty/libmygpo-qt/DeviceList.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef DEVICELIST_H
-#define DEVICELIST_H
+#ifndef LIBMYGPO_QT_DEVICELIST_H
+#define LIBMYGPO_QT_DEVICELIST_H
 
 #include <QNetworkReply>
 #include <QSharedPointer>
@@ -65,4 +65,4 @@ typedef QSharedPointer<DeviceList> DeviceListPtr;
 
 Q_DECLARE_METATYPE( mygpo::DeviceListPtr );
 
-#endif //DEVICELIST_H
\ No newline at end of file
+#endif //LIBMYGPO_QT_DEVICELIST_H
diff --git a/3rdparty/libmygpo-qt/DeviceSyncResult.h b/3rdparty/libmygpo-qt/DeviceSyncResult.h
index a43c1d1b1..fef366f53 100644
--- a/3rdparty/libmygpo-qt/DeviceSyncResult.h
+++ b/3rdparty/libmygpo-qt/DeviceSyncResult.h
@@ -18,8 +18,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef DEVICESYNCRESULT_H
-#define DEVICESYNCRESULT_H
+#ifndef LIBMYGPO_QT_DEVICESYNCRESULT_H
+#define LIBMYGPO_QT_DEVICESYNCRESULT_H
 
 #include <QNetworkReply>
 #include <QObject>
@@ -63,4 +63,4 @@ typedef QSharedPointer<DeviceSyncResult> DeviceSyncResultPtr;
 
 }
 
-#endif // DEVICESYNCRESULT_H
+#endif // LIBMYGPO_QT_DEVICESYNCRESULT_H
diff --git a/3rdparty/libmygpo-qt/DeviceUpdates.h b/3rdparty/libmygpo-qt/DeviceUpdates.h
index ba42b22de..7923a58a0 100644
--- a/3rdparty/libmygpo-qt/DeviceUpdates.h
+++ b/3rdparty/libmygpo-qt/DeviceUpdates.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef DEVICEUPDATES_H
-#define DEVICEUPDATES_H
+#ifndef LIBMYGPO_QT_DEVICEUPDATES_H
+#define LIBMYGPO_QT_DEVICEUPDATES_H
 
 #include <QNetworkReply>
 #include <QUrl>
@@ -69,4 +69,4 @@ typedef QSharedPointer<DeviceUpdates> DeviceUpdatesPtr;
 
 }
 
-#endif // DEVICEUPDATES_H
\ No newline at end of file
+#endif // LIBMYGPO_QT_DEVICEUPDATES_H
diff --git a/3rdparty/libmygpo-qt/Episode.h b/3rdparty/libmygpo-qt/Episode.h
index daec5c351..fc22b3266 100644
--- a/3rdparty/libmygpo-qt/Episode.h
+++ b/3rdparty/libmygpo-qt/Episode.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef EPISODE_H
-#define EPISODE_H
+#ifndef LIBMYGPO_QT_EPISODE_H
+#define LIBMYGPO_QT_EPISODE_H
 
 #include <QObject>
 #include <QUrl>
@@ -93,4 +93,4 @@ typedef QSharedPointer<Episode> EpisodePtr;
 
 Q_DECLARE_METATYPE( mygpo::EpisodePtr );
 
-#endif // EPISODE_H
+#endif // LIBMYGPO_QT_EPISODE_H
diff --git a/3rdparty/libmygpo-qt/EpisodeAction.h b/3rdparty/libmygpo-qt/EpisodeAction.h
index 11aa2010e..321761ff8 100644
--- a/3rdparty/libmygpo-qt/EpisodeAction.h
+++ b/3rdparty/libmygpo-qt/EpisodeAction.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef EPISODEACTION_H
-#define EPISODEACTION_H
+#ifndef LIBMYGPO_QT_EPISODEACTION_H
+#define LIBMYGPO_QT_EPISODEACTION_H
 
 #include <QUrl>
 #include <QString>
@@ -75,4 +75,4 @@ typedef QSharedPointer<EpisodeAction> EpisodeActionPtr;
 
 Q_DECLARE_METATYPE( mygpo::EpisodeActionPtr );
 
-#endif // EPISODEACTION_H
+#endif // LIBMYGPO_QT_EPISODEACTION_H
diff --git a/3rdparty/libmygpo-qt/EpisodeActionList.h b/3rdparty/libmygpo-qt/EpisodeActionList.h
index b14847dd9..e61984a2b 100644
--- a/3rdparty/libmygpo-qt/EpisodeActionList.h
+++ b/3rdparty/libmygpo-qt/EpisodeActionList.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef EPISODEACTIONLIST_H
-#define EPISODEACTIONLIST_H
+#ifndef LIBMYGPO_QT_EPISODEACTIONLIST_H
+#define LIBMYGPO_QT_EPISODEACTIONLIST_H
 
 #include "EpisodeAction.h"
 #include "mygpo_export.h"
@@ -68,4 +68,4 @@ typedef QSharedPointer<EpisodeActionList> EpisodeActionListPtr;
 
 Q_DECLARE_METATYPE( mygpo::EpisodeActionListPtr );
 
-#endif // EPISODEACTIONLIST_H
+#endif // LIBMYGPO_QT_EPISODEACTIONLIST_H
diff --git a/3rdparty/libmygpo-qt/EpisodeList.h b/3rdparty/libmygpo-qt/EpisodeList.h
index 3e7c86915..3258f7770 100644
--- a/3rdparty/libmygpo-qt/EpisodeList.h
+++ b/3rdparty/libmygpo-qt/EpisodeList.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef EPISODELIST_H
-#define EPISODELIST_H
+#ifndef LIBMYGPO_QT_EPISODELIST_H
+#define LIBMYGPO_QT_EPISODELIST_H
 
 #include "mygpo_export.h"
 #include "Episode.h"
@@ -63,4 +63,4 @@ typedef QSharedPointer<EpisodeList> EpisodeListPtr;
 
 }
 
-#endif // EPISODELIST_H
+#endif // LIBMYGPO_QT_EPISODELIST_H
diff --git a/3rdparty/libmygpo-qt/JsonCreator.h b/3rdparty/libmygpo-qt/JsonCreator.h
index 70f053bf2..06bab6827 100644
--- a/3rdparty/libmygpo-qt/JsonCreator.h
+++ b/3rdparty/libmygpo-qt/JsonCreator.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef JSONPARSER_H
-#define JSONPARSER_H
+#ifndef LIBMYGPO_QT_JSONPARSER_H
+#define LIBMYGPO_QT_JSONPARSER_H
 
 #include <QByteArray>
 #include <QVariant>
@@ -53,4 +53,4 @@ private:
 
 }
 
-#endif // JSONPARSER_H
+#endif // LIBMYGPO_QT_JSONPARSER_H
diff --git a/3rdparty/libmygpo-qt/Podcast.h b/3rdparty/libmygpo-qt/Podcast.h
index 22eba8ace..d3be273bf 100644
--- a/3rdparty/libmygpo-qt/Podcast.h
+++ b/3rdparty/libmygpo-qt/Podcast.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef PODCAST_H
-#define PODCAST_H
+#ifndef LIBMYGPO_QT_PODCAST_H
+#define LIBMYGPO_QT_PODCAST_H
 
 #include <QUrl>
 #include <QString>
@@ -81,4 +81,4 @@ typedef QSharedPointer<Podcast> PodcastPtr;
 
 Q_DECLARE_METATYPE( mygpo::PodcastPtr );
 
-#endif // PODCAST_H
+#endif // LIBMYGPO_QT_PODCAST_H
diff --git a/3rdparty/libmygpo-qt/PodcastList.h b/3rdparty/libmygpo-qt/PodcastList.h
index c525d73f5..8716c9859 100644
--- a/3rdparty/libmygpo-qt/PodcastList.h
+++ b/3rdparty/libmygpo-qt/PodcastList.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef PODCASTLIST_H
-#define PODCASTLIST_H
+#ifndef LIBMYGPO_QT_PODCASTLIST_H
+#define LIBMYGPO_QT_PODCASTLIST_H
 
 #include "Podcast.h"
 #include "mygpo_export.h"
@@ -64,4 +64,4 @@ typedef QSharedPointer<PodcastList> PodcastListPtr;
 
 }
 
-#endif // PODCASTLIST_H
+#endif // LIBMYGPO_QT_PODCASTLIST_H
diff --git a/3rdparty/libmygpo-qt/RequestHandler.h b/3rdparty/libmygpo-qt/RequestHandler.h
index a1f97b6c5..4c58ddfaf 100644
--- a/3rdparty/libmygpo-qt/RequestHandler.h
+++ b/3rdparty/libmygpo-qt/RequestHandler.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef REQUESTHANDLER_H_
-#define REQUESTHANDLER_H_
+#ifndef LIBMYGPO_QT_REQUESTHANDLER_H_
+#define LIBMYGPO_QT_REQUESTHANDLER_H_
 
 #include "mygpo_export.h"
 
@@ -82,4 +82,4 @@ private:
 
 }
 
-#endif /* REQUESTHANDLER_H_ */
+#endif /* LIBMYGPO_QT_REQUESTHANDLER_H_ */
diff --git a/3rdparty/libmygpo-qt/Settings.h b/3rdparty/libmygpo-qt/Settings.h
index ff0029d55..d18c32f5a 100644
--- a/3rdparty/libmygpo-qt/Settings.h
+++ b/3rdparty/libmygpo-qt/Settings.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef SETTINGS_H
-#define SETTINGS_H
+#ifndef LIBMYGPO_QT_SETTINGS_H
+#define LIBMYGPO_QT_SETTINGS_H
 
 #include <QSharedPointer>
 #include <QMap>
@@ -63,4 +63,4 @@ typedef QSharedPointer<Settings> SettingsPtr;
 
 }
 
-#endif // SETTINGS_H
+#endif // LIBMYGPO_QT_SETTINGS_H
diff --git a/3rdparty/libmygpo-qt/Tag.h b/3rdparty/libmygpo-qt/Tag.h
index ba0b7ac61..b35358685 100644
--- a/3rdparty/libmygpo-qt/Tag.h
+++ b/3rdparty/libmygpo-qt/Tag.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef TAG_H
-#define TAG_H
+#ifndef LIBMYGPO_QT_TAG_H
+#define LIBMYGPO_QT_TAG_H
 
 #include "mygpo_export.h"
 
@@ -56,4 +56,4 @@ typedef QSharedPointer<Tag> TagPtr;
 
 Q_DECLARE_METATYPE( mygpo::TagPtr );
 
-#endif // TAG_H
+#endif // LIBMYGPO_QT_TAG_H
diff --git a/3rdparty/libmygpo-qt/TagList.h b/3rdparty/libmygpo-qt/TagList.h
index 831dee313..2963644e2 100644
--- a/3rdparty/libmygpo-qt/TagList.h
+++ b/3rdparty/libmygpo-qt/TagList.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef TAGLIST_H
-#define TAGLIST_H
+#ifndef LIBMYGPO_QT_TAGLIST_H
+#define LIBMYGPO_QT_TAGLIST_H
 
 #include "Tag.h"
 #include "mygpo_export.h"
@@ -63,4 +63,4 @@ typedef QSharedPointer<TagList> TagListPtr;
 
 Q_DECLARE_METATYPE( mygpo::TagListPtr );
 
-#endif // TAGLIST_H
+#endif // LIBMYGPO_QT_TAGLIST_H
diff --git a/3rdparty/libmygpo-qt/UrlBuilder.h b/3rdparty/libmygpo-qt/UrlBuilder.h
index 640dc697f..46a40e5ba 100644
--- a/3rdparty/libmygpo-qt/UrlBuilder.h
+++ b/3rdparty/libmygpo-qt/UrlBuilder.h
@@ -20,8 +20,8 @@
 * USA                                                                      *
 ***************************************************************************/
 
-#ifndef URLBUILDER_H
-#define URLBUILDER_H
+#ifndef LIBMYGPO_QT_URLBUILDER_H
+#define LIBMYGPO_QT_URLBUILDER_H
 
 #include <QString>
 
@@ -143,4 +143,4 @@ private:
 };
 }
 
-#endif // URLBUILDER_H
+#endif // LIBMYGPO_QT_URLBUILDER_H