1 files changed, 10 insertions, 3 deletions
diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp
index dbb9ab596..446a529ba 100644
--- a/src/mumble/Settings.cpp
+++ b/src/mumble/Settings.cpp
@@ -3,18 +3,25 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "mumble_pch.hpp"
-
 #include "Settings.h"
 
 #include "AudioInput.h"
 #include "Cert.h"
 #include "Log.h"
-#include "Global.h"
 #include "SSL.h"
 
 #include "../../overlay/overlay.h"
 
+#include <QtCore/QProcessEnvironment>
+#include <QtCore/QStandardPaths>
+#include <QtGui/QImageReader>
+#include <QtWidgets/QSystemTrayIcon>
+
+#include <boost/typeof/typeof.hpp>
+
+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
+#include "Global.h"
+
 bool Shortcut::isServerSpecific() const {
 	if (qvData.canConvert<ShortcutTarget>()) {
 		const ShortcutTarget &sc = qvariant_cast<ShortcutTarget> (qvData);