Add missing includes for "no-pch" build

This commit adds all the missing includes when the PCH header is not used.

Also, some includes are reordered and/or made consistent (e.g. "#include <QtEndian>" -> "#include <QtCore/QtEndian>").

3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp

@@ -28,6 +28,8 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BonjourServiceBrowser.h"
 
+#include <QtCore/QSocketNotifier>
+
 BonjourServiceBrowser::BonjourServiceBrowser(QObject *p)
 		: QObject(p), dnssref(0), bonjourSocket(0) {
 }

3rdparty/qqbonjour-src/BonjourServiceRegister.cpp

@@ -29,6 +29,8 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BonjourServiceRegister.h"
 
+#include <QtCore/QSocketNotifier>
+
 BonjourServiceRegister::BonjourServiceRegister(QObject *p)
 		: QObject(p), dnssref(0), bonjourSocket(0) {
 }

3rdparty/qqbonjour-src/BonjourServiceResolver.cpp

@@ -29,6 +29,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BonjourServiceResolver.h"
 
+#include <QtCore/QSocketNotifier>
+#include <QtCore/QtEndian>
+
 BonjourServiceResolver::ResolveRecord::ResolveRecord(const BonjourRecord &r, BonjourServiceResolver *p) : record(r), bsr(p), dnssref(NULL), bonjourSocket(NULL), bonjourPort(-1) {
 }
 

3rdparty/smallft-src/smallft.cpp

@@ -40,6 +40,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "smallft.h"
 
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+
 static void drfti1(int n, float *wa, int *ifac) {
 	static int ntryh[4] = { 4,2,3,5 };
 	static float tpi = 6.28318530717958648f;

src/ACL.cpp

@@ -10,6 +10,8 @@
 
 #ifdef MURMUR
 #include "ServerUser.h"
+
+#include <QtCore/QStack>
 #endif
 
 ChanACL::ChanACL(Channel *chan) : QObject(chan) {

src/ByteSwap.h

@@ -6,14 +6,17 @@
 #ifndef MUMBLE_BYTESWAP_H_
 #define MUMBLE_BYTESWAP_H_
 
+#include <QtCore/QtGlobal>
+
 #if Q_BYTE_ORDER == Q_BIG_ENDIAN
-#define SWAP64(x) (x)
+# define SWAP64(x) (x)
 #else
-#if defined(__x86_64__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
-#define SWAP64(x) __builtin_bswap64(x)
-#else
-#define SWAP64(x) qbswap<quint64>(x)
-#endif
+# if defined(__x86_64__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
+#  define SWAP64(x) __builtin_bswap64(x)
+# else
+#  include <QtCore/QtEndian>
+#  define SWAP64(x) qbswap<quint64>(x)
+# endif
 #endif
 
 #endif

src/Channel.cpp

@@ -8,6 +8,8 @@
 #include "Group.h"
 #include "ACL.h"
 
+#include <QtCore/QStack>
+
 #ifdef MUMBLE
 QHash<int, Channel *> Channel::c_qhChannels;
 QReadWriteLock Channel::c_qrwlChannels;

src/Connection.cpp

@@ -3,18 +3,22 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#ifdef Q_OS_UNIX
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#endif
-
 #include "Connection.h"
 #include "Message.h"
 #include "SSL.h"
 #include "Mumble.pb.h"
 
+#include <QtCore/QtEndian>
+#include <QtNetwork/QHostAddress>
+
+#ifdef Q_OS_WIN
+# include <qos2.h>
+#else
+# include <sys/socket.h>
+# include <sys/types.h>
+# include <netinet/in.h>
+# include <netinet/tcp.h>
+#endif
 
 #ifdef Q_OS_WIN
 HANDLE Connection::hQoS = NULL;

src/Connection.h

@@ -7,21 +7,29 @@
 #define MUMBLE_CONNECTION_H_
 
 #include <QtCore/QtGlobal>
-#include <QtCore/QMutex>
-#if QT_VERSION >= 0x040700
-#include <QtCore/QElapsedTimer>
-#else
-#include <QtCore/QTime>
-#endif
-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtNetwork/QSslSocket>
+
 #ifdef Q_OS_WIN
-#include <windows.h>
+# include "win.h"
 #endif
 
 #include "CryptState.h"
 
+#include <QtCore/QMutex>
+
+#if QT_VERSION >= 0x040700
+# include <QtCore/QElapsedTimer>
+#else
+# include <QtCore/QTime>
+#endif
+
+#include <QtCore/QList>
+#include <QtCore/QObject>
+#include <QtNetwork/QSslSocket>
+
+#ifdef Q_OS_WIN
+# include <ws2tcpip.h>
+#endif
+
 namespace google {
 namespace protobuf {
 class Message;

src/CryptState.cpp

@@ -12,10 +12,25 @@
  * OCB with something else or get yourself a license.
  */
 
+#include <QtCore/QtGlobal>
+
+#ifndef __LP64__
+# ifdef Q_OS_WIN
+#  include "win.h"
+#  include <winsock2.h>
+# else
+#  include <arpa/inet.h>
+# endif
+#endif
+
 #include "CryptState.h"
 
 #include "ByteSwap.h"
 
+#include <cstring>
+
+#include <openssl/rand.h>
+
 CryptState::CryptState() {
 	for (int i=0;i<0x100;i++)
 		decrypt_history[i] = 0;

src/CryptographicHash.cpp

@@ -5,6 +5,10 @@
 
 #include "CryptographicHash.h"
 
+#include <QtCore/QString>
+
+#include <openssl/evp.h>
+
 class CryptographicHashPrivate {
 	public:
 		CryptographicHashPrivate(const EVP_MD *type);

src/CryptographicRandom.cpp

@@ -7,6 +7,10 @@
 
 #include "arc4random_uniform.h"
 
+#include <QtCore/QDebug>
+
+#include <openssl/rand.h>
+
 void CryptographicRandom::fillBuffer(void *buf, int numBytes) {
 	// We treat negative and zero values of numBytes to be
 	// fatal errors in the program. Abort the program if such

src/FFDHE.cpp

@@ -6,6 +6,8 @@
 #include "FFDHE.h"
 #include "FFDHETable.h"
 
+#include <QtCore/QStringList>
+
 QStringList FFDHE::NamedGroups() {
 	QStringList ng;
 	ng << QLatin1String("ffdhe2048");

src/FFDHE.h

@@ -6,6 +6,10 @@
 #ifndef MUMBLE_FFDHE_H_
 #define MUMBLE_FFDHE_H_
 
+class QByteArray;
+class QString;
+class QStringList;
+
 /// FFDHE provides access to the Diffie-Hellman parameters from RFC 7919.
 class FFDHE {
 	public:

src/Group.cpp

@@ -9,6 +9,8 @@
 #include "User.h"
 #ifdef MURMUR
 #include "ServerUser.h"
+
+#include <QtCore/QStack>
 #endif
 
 Group::Group(Channel *assoc, const QString &name) {

src/HTMLFilter.cpp

@@ -5,6 +5,8 @@
 
 #include "HTMLFilter.h"
 
+#include <QtCore/QXmlStreamReader>
+
 QString HTMLFilter::escapeTags(const QString &in) {
 	QString out;
 	for (int i = 0; i < in.size(); i++) {

src/HostAddress.cpp

@@ -7,6 +7,19 @@
 
 #include "ByteSwap.h"
 
+#ifdef Q_OS_WIN
+# include "win.h"
+# include <winsock2.h>
+# include <ws2tcpip.h>
+#else
+# include <arpa/inet.h>
+# if defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
+#  include <netinet/in.h>
+#  include <sys/socket.h>
+#  include <sys/types.h>
+# endif
+#endif
+
 HostAddress::HostAddress() {
 	addr[0] = addr[1] = 0ULL;
 }

src/OSInfo.cpp

@@ -3,28 +3,41 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
+#include <QtCore/QtGlobal>
+
 #if defined(Q_OS_WIN)
-#include <intrin.h>
-#endif
-
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
-#include <sys/utsname.h>
-#endif
-
-#if defined(Q_OS_MAC)
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <mach-o/arch.h>
-
-// Ignore deprecation warnings for Gestalt.
-// See mumble-voip/mumble#3290 for more information.
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
+# include "win.h"
 #endif
 
 #include "OSInfo.h"
+
 #include "Version.h"
 
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QProcess>
+#include <QtNetwork/QNetworkInterface>
+#include <QtXml/QDomDocument>
+
+#if defined(Q_OS_WIN)
+# include <intrin.h>
+#endif
+
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+# include <sys/utsname.h>
+#endif
+
+#if defined(Q_OS_MAC)
+# include <Carbon/Carbon.h>
+# include <sys/types.h>
+# include <sys/sysctl.h>
+# include <mach-o/arch.h>
+
+// Ignore deprecation warnings for Gestalt.
+// See mumble-voip/mumble#3290 for more information.
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+#endif
+
 #if defined(Q_OS_WIN)
 // regString converts a wchar_t string of size to a
 // QString. If the string contains a NUL value, that

src/OSInfo.h

@@ -6,8 +6,12 @@
 #ifndef MUMBLE_OSINFO_H_
 #define MUMBLE_OSINFO_H_
 
+#include <QtCore/QList>
+#include <QtCore/QString>
+
 class QDomDocument;
 class QDomElement;
+class QHostAddress;
 
 class OSInfo {
 	public:

src/PasswordGenerator.cpp

@@ -6,6 +6,8 @@
 #include "CryptographicRandom.h"
 #include "PasswordGenerator.h"
 
+#include <QtCore/QVector>
+
 // This is a password alphabet that tries to be human-friendly.
 // Most cases of ambiguitiy have been removed.
 //

src/SSL.cpp

@@ -8,6 +8,12 @@
 
 #include "Version.h"
 
+
+#include <QtNetwork/QSslConfiguration>
+#include <QtNetwork/QSslSocket>
+
+#include <openssl/ssl.h>
+
 void MumbleSSL::initialize() {
 	// Let Qt initialize its copy of OpenSSL, if it's different than
 	// Mumble's. (Initialization is a side-effect of calling

src/SSLCipherInfo.cpp

@@ -8,6 +8,8 @@
 // Include SSLCipherInfoTable generated by 'cipherinfo.py'.
 #include "SSLCipherInfoTable.h"
 
+#include <cstring>
+
 const SSLCipherInfo *SSLCipherInfoLookupByOpenSSLName(const char *openSslCipherName) {
 	int len = sizeof(cipher_info_lookup_table) / sizeof(*cipher_info_lookup_table);
 	for (int i = 0; i < len; i++) {

src/SSLLocks.cpp

@@ -5,6 +5,11 @@
 
 #include "SSLLocks.h"
 
+#include <QtCore/QMutex>
+#include <QtCore/QThread>
+
+#include <openssl/crypto.h>
+
 static QMutex **locks = NULL;
 
 void locking_callback(int mode, int type, const char *, int) {

src/SelfSignedCertificate.cpp

@@ -5,6 +5,8 @@
 
 #include "SelfSignedCertificate.h"
 
+#include <openssl/x509v3.h>
+
 #define SSL_STRING(x) QString::fromLatin1(x).toUtf8().data()
 
 static int add_ext(X509 * crt, int nid, char *value) {

src/Timer.cpp

@@ -76,7 +76,7 @@ quint64 Timer::now() {
 	return static_cast<quint64>(epochDurationUsec.count());
 }
 #elif defined(Q_OS_WIN)
-#include <windows.h>
+# include "win.h"
 
 quint64 Timer::now() {
 	static double scale = 0;

src/UnresolvedServerAddress.cpp

@@ -5,6 +5,8 @@
 
 #include "UnresolvedServerAddress.h"
 
+#include <QtCore/QHash>
+
 UnresolvedServerAddress::UnresolvedServerAddress()
 	: port(0) {}
 

src/Version.cpp

@@ -5,6 +5,8 @@
 
 #include "Version.h"
 
+#include <QtCore/QRegExp>
+
 unsigned int MumbleVersion::getRaw(const QString &version) {
 	int major, minor, patch;
 

src/Version.h

@@ -6,6 +6,8 @@
 #ifndef MUMBLE_VERSION_H_
 #define MUMBLE_VERSION_H_
 
+#include <QtCore/QString>
+
 #define MUMXTEXT(X) #X
 #define MUMTEXT(X) MUMXTEXT(X)
 

src/mumble/ACLEditor.cpp

@@ -13,6 +13,12 @@
 #include "ServerHandler.h"
 #include "User.h"
 
+#if QT_VERSION >= 0x050000
+# include <QtWidgets/QMessageBox>
+#else
+# include <QtGui/QMessageBox>
+#endif
+
 // 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"
 

src/mumble/ALSAAudio.cpp

@@ -3,14 +3,17 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include <alsa/asoundlib.h>
-#include <sys/poll.h>
-
 #include "ALSAAudio.h"
 
 #include "MainWindow.h"
-#include "Global.h"
 #include "User.h"
+#include "Utils.h"
+
+#include <alsa/asoundlib.h>
+#include <sys/poll.h>
+
+// 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"
 
 #define NBLOCKS 8
 

src/mumble/ASIOInput.cpp

@@ -6,6 +6,13 @@
 #include "ASIOInput.h"
 
 #include "MainWindow.h"
+#include "Utils.h"
+
+#include <QtWidgets/QMessageBox>
+
+#include <cmath>
+
+// 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"
 
 // From os_win.cpp.

src/mumble/ASIOInput.h

@@ -6,16 +6,21 @@
 #ifndef MUMBLE_MUMBLE_ASIOINPUT_H_
 #define MUMBLE_MUMBLE_ASIOINPUT_H_
 
+#include "ui_ASIOInput.h"
+
+#include "AudioInput.h"
+#include "ConfigDialog.h"
+
+#include "win.h"
+
 #include <QtCore/QList>
 #include <QtCore/QObject>
 #include <QtCore/QString>
 #include <QtCore/QWaitCondition>
 
-#include <windows.h>
+#include <combaseapi.h>
+
 #include <asiodrvr.h>
-#include "AudioInput.h"
-#include "ConfigDialog.h"
-#include "ui_ASIOInput.h"
 
 typedef QPair<QString, QString> ASIODev;
 

src/mumble/About.cpp

@@ -8,6 +8,10 @@
 #include "MainWindow.h"
 #include "License.h"
 
+#include "Utils.h"
+
+#include <QtWidgets/QPushButton>
+
 // 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"
 

src/mumble/AppNap.mm

@@ -3,6 +3,10 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
+#include "MumbleApplication.h"
+
+#include <Foundation/Foundation.h>
+
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
 static bool appNapSuppressed = false;
 #endif

src/mumble/AudioConfigDialog.cpp

@@ -41,6 +41,7 @@
 #include "AudioOutputSample.h"
 #include "Global.h"
 #include "NetworkConfig.h"
+#include "Utils.h"
 
 static ConfigWidget *AudioInputDialogNew(Settings &st) {
 	return new AudioInputDialog(st);

src/mumble/AudioInput.cpp

@@ -16,6 +16,7 @@
 #include "Message.h"
 #include "Global.h"
 #include "NetworkConfig.h"
+#include "Utils.h"
 #include "VoiceRecorder.h"
 
 #ifdef USE_RNNOISE

src/mumble/AudioOutput.cpp

@@ -3,6 +3,14 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
+// <cmath> includes <math.h>, but only if it isn't already included.
+// We include <cmath> as first header to make sure that we include <math.h> with _USE_MATH_DEFINES.
+#ifdef _MSC_VER
+# define _USE_MATH_DEFINES
+#endif
+
+#include <cmath>
+
 #include "AudioOutput.h"
 
 #include "AudioInput.h"
@@ -14,6 +22,7 @@
 #include "PacketDataStream.h"
 #include "ServerHandler.h"
 #include "Timer.h"
+#include "Utils.h"
 #include "VoiceRecorder.h"
 
 // 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.

src/mumble/AudioOutputSample.cpp

@@ -6,6 +6,13 @@
 #include "AudioOutputSample.h"
 
 #include "Audio.h"
+#include "Utils.h"
+
+#include <QtCore/QDebug>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMessageBox>
+
+#include <cmath>
 
 SoundFile::SoundFile(const QString &fname) {
 	siInfo.frames = 0;

src/mumble/AudioOutputSpeech.cpp

@@ -3,6 +3,16 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
+// We want to include <math.h> with _USE_MATH_DEFINES defined.
+// To make sure we do so before anything else includes the header without it
+// (triggering the guard and effectively preventing a "fix include")
+// we define and include before anything else.
+#ifdef _MSC_VER
+# define _USE_MATH_DEFINES
+#endif
+
+#include <cmath>
+
 #include "AudioOutputSpeech.h"
 
 #include "Audio.h"
@@ -11,6 +21,7 @@
 #include "ClientUser.h"
 #include "Global.h"
 #include "PacketDataStream.h"
+#include "Utils.h"
 
 AudioOutputSpeech::AudioOutputSpeech(ClientUser *user, unsigned int freq, MessageHandler::UDPMessageType type) : AudioOutputUser(user->qsName) {
 	int err;

src/mumble/AudioStats.cpp

@@ -7,8 +7,13 @@
 
 #include "AudioInput.h"
 #include "Global.h"
+#include "Utils.h"
 #include "smallft.h"
 
+#include <QtGui/QPainter>
+
+#include <cmath>
+
 AudioBar::AudioBar(QWidget *p) : QWidget(p) {
 	qcBelow = Qt::yellow;
 	qcAbove = Qt::red;

src/mumble/AudioWizard.cpp

@@ -9,6 +9,12 @@
 #include "AudioOutputSample.h"
 #include "Log.h"
 #include "MainWindow.h"
+#include "Utils.h"
+
+#include <QtGui/QMouseEvent>
+#include <QtWidgets/QGraphicsEllipseItem>
+
+#include <cmath>
 
 // 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"

src/mumble/Cert.cpp

@@ -13,8 +13,20 @@
 
 #include "Cert.h"
 
-#include "Global.h"
 #include "SelfSignedCertificate.h"
+#include "Utils.h"
+
+#include <QtCore/QUrl>
+#include <QtGui/QDesktopServices>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QToolTip>
+
+#include <openssl/evp.h>
+#include <openssl/pkcs12.h>
+#include <openssl/x509.h>
+
+// 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"
 
 #define SSL_STRING(x) QString::fromLatin1(x).toUtf8().data()
 

src/mumble/ConfigDialog.cpp

@@ -10,6 +10,11 @@
 #include "Global.h"
 #include "Overlay.h"
 
+#include <QtGui/QScreen>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QPushButton>
+
+
 ConfigDialog::ConfigDialog(QWidget *p) : QDialog(p) {
 	setupUi(this);
 

src/mumble/ConfigWidget.cpp

@@ -5,6 +5,14 @@
 
 #include "ConfigWidget.h"
 
+#include "MumbleApplication.h"
+
+#include <QtCore/QMap>
+#include <QtGui/QIcon>
+#include <QtWidgets/QAbstractButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QSlider>
+
 QMap<int, ConfigWidgetNew> *ConfigRegistrar::c_qmNew;
 
 ConfigRegistrar::ConfigRegistrar(int priority, ConfigWidgetNew n) {

src/mumble/ConnectDialog.cpp

@@ -16,6 +16,27 @@
 #include "ServerHandler.h"
 #include "WebFetch.h"
 #include "ServerResolver.h"
+#include "Utils.h"
+
+#include <QtCore/QMimeData>
+#include <QtCore/QUrlQuery>
+#include <QtCore/QtEndian>
+#include <QtGui/QClipboard>
+#include <QtGui/QDesktopServices>
+#include <QtGui/QPainter>
+#include <QtNetwork/QUdpSocket>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QShortcut>
+#include <QtXml/QDomDocument>
+
+#include <boost/accumulators/statistics/extended_p_square.hpp>
+#include <boost/array.hpp>
+
+#ifdef Q_OS_WIN
+# include <shlobj.h>
+#endif
 
 // 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"

src/mumble/CoreAudio.cpp

@@ -6,6 +6,10 @@
 #include "CoreAudio.h"
 
 #include "User.h"
+
+#include <Carbon/Carbon.h>
+
+// 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"
 
 // Ignore deprecation warnings for the whole file, for now.

src/mumble/CrashReporter.cpp

@@ -10,6 +10,12 @@
 #include "OSInfo.h"
 #include "EnvUtils.h"
 
+#include <QtCore/QProcess>
+#include <QtCore/QTemporaryFile>
+#include <QtNetwork/QHostAddress>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QPushButton>
+
 CrashReporter::CrashReporter(QWidget *p) : QDialog(p) {
 	setWindowTitle(tr("Mumble Crash Report"));
 

src/mumble/CustomElements.cpp

@@ -8,6 +8,14 @@
 #include "ClientUser.h"
 #include "MainWindow.h"
 #include "Log.h"
+#include "Utils.h"
+
+#include <QtCore/QTimer>
+#include <QtGui/QAbstractTextDocumentLayout>
+#include <QtGui/QClipboard>
+#include <QtGui/QContextMenuEvent>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QScrollBar>
 
 // 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"

src/mumble/DBus.cpp

@@ -10,6 +10,10 @@
 #include "MainWindow.h"
 #include "ServerHandler.h"
 
+#include <QtCore/QUrlQuery>
+#include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusMessage>
+
 // 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"
 

src/mumble/Database.cpp

@@ -7,9 +7,15 @@
 
 #include "Global.h"
 #include "Message.h"
+#include "MumbleApplication.h"
 #include "Net.h"
+#include "Utils.h"
 #include "Version.h"
 
+#include <QtCore/QStandardPaths>
+#include <QtSql/QSqlError>
+#include <QtSql/QSqlQuery>
+#include <QtWidgets/QMessageBox>
 
 static void logSQLError(const QSqlQuery &query) {
 	const QSqlError error(query.lastQuery());

src/mumble/DeveloperConsole.cpp

@@ -6,6 +6,10 @@
 #include "DeveloperConsole.h"
 
 #include "LogEmitter.h"
+
+#include <QtWidgets/QTextBrowser>
+
+// 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"
 
 DeveloperConsole::DeveloperConsole(QObject *parent)

src/mumble/DirectSound.cpp

@@ -3,6 +3,14 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
+#include "DirectSound.h"
+
+#include "MainWindow.h"
+#include "Plugins.h"
+#include "User.h"
+
+#include "win.h"
+
 #define DIRECTSOUND_VERSION 0x1000
 
 #include <mmsystem.h>
@@ -10,11 +18,7 @@
 #include <ks.h>
 #include <ksmedia.h>
 
-#include "DirectSound.h"
-
-#include "MainWindow.h"
-#include "Plugins.h"
-#include "User.h"
+// 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"
 
 // from os_win.cpp

src/mumble/G15LCDEngine_helper.h

@@ -5,9 +5,12 @@
 
 #ifndef MUMBLE_MUMBLE_G15LCDENGINE_HELPER_H_
 #define MUMBLE_MUMBLE_G15LCDENGINE_HELPER_H_
+
 #include "LCD.h"
 #include "../../g15helper/g15helper.h"
 
+#include <QtCore/QProcess>
+
 class G15LCDDeviceHelper;
 
 class G15LCDEngineHelper : public LCDEngine {

src/mumble/GKey.h

@@ -6,7 +6,7 @@
 #ifndef MUMBLE_MUMBLE_GKEY_H
 #define MUMBLE_MUMBLE_GKEY_H
 
-#include <windows.h>
+#include "win.h"
 
 #include <QtCore/QLibrary>
 #include <QtCore/QString>

src/mumble/Global.cpp

@@ -3,6 +3,15 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
+#include "MumbleApplication.h"
+
+#include <QtCore/QStandardPaths>
+
+#ifdef Q_OS_WIN
+# include <shlobj.h>
+#endif
+
+// 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"
 
 Global *Global::g_global_struct;

src/mumble/GlobalShortcut.cpp

@@ -11,6 +11,15 @@
 #include "Database.h"
 #include "MainWindow.h"
 
+#include <QtCore/QProcess>
+#include <QtGui/QFocusEvent>
+#include <QtWidgets/QItemEditorFactory>
+
+#ifdef Q_OS_MAC
+# include <QtCore/QOperatingSystemVersion>
+# include <ApplicationServices/ApplicationServices.h>
+#endif
+
 // 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"
 

src/mumble/GlobalShortcut_unix.cpp

@@ -5,9 +5,14 @@
 
 #include "GlobalShortcut_unix.h"
 
-#include "Global.h"
 #include "Settings.h"
 
+#include <QtCore/QFileSystemWatcher>
+#include <QtCore/QSocketNotifier>
+
+// 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"
+
 // We have to use a global 'diagnostic ignored' pragmas because
 // we still support old versions of GCC. (FreeBSD 9.3 ships with GCC 4.2)
 #if defined (__GNUC__)

src/mumble/GlobalShortcut_win.cpp

@@ -3,21 +3,27 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
+#include "GlobalShortcut_win.h"
+
+#include "MainWindow.h"
+#include "OverlayClient.h"
+#include "Utils.h"
+
 // MinGW does not support std::future/std::promise
 // at present. Use Boost's implementation for now.
 #define BOOST_THREAD_VERSION 4
 #include <boost/thread.hpp>
 #include <boost/thread/future.hpp>
 
-#include "GlobalShortcut_win.h"
-
-#include "MainWindow.h"
-#include "OverlayClient.h"
-#include "Global.h"
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QTimer>
 
 // 3rdparty/xinputcheck-src.
 #include <xinputcheck.h>
 
+// 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"
+
 #undef FAILED
 #define FAILED(Status) (static_cast<HRESULT>(Status)<0)
 

src/mumble/LCD.cpp

@@ -9,6 +9,9 @@
 #include "Channel.h"
 #include "Message.h"
 #include "ServerHandler.h"
+#include "Utils.h"
+
+#include <QtGui/QPainter>
 
 // 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"

src/mumble/Log.cpp

@@ -14,6 +14,14 @@
 #include "Screen.h"
 #include "ServerHandler.h"
 #include "TextToSpeech.h"
+#include "Utils.h"
+
+#include <QtNetwork/QNetworkReply>
+#include <QtGui/QImageWriter>
+#include <QtGui/QScreen>
+#include <QtGui/QTextBlock>
+#include <QtGui/QTextDocumentFragment>
+#include <QtWidgets/QDesktopWidget>
 
 // 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"

src/mumble/Log_macx.mm

@@ -4,6 +4,12 @@
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
 #include "Log.h"
+
+#include <QtCore/QOperatingSystemVersion>
+
+#include <Foundation/Foundation.h>
+
+// 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"
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080

src/mumble/Log_unix.cpp

@@ -7,6 +7,8 @@
 #include "MainWindow.h"
 #include "Settings.h"
 
+#include <QtDBus/QDBusInterface>
+
 // 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"
 

src/mumble/LookConfig.cpp

@@ -10,6 +10,10 @@
 #include "AudioOutput.h"
 #include "MainWindow.h"
 
+#include <QtCore/QFileSystemWatcher>
+#include <QtCore/QStack>
+#include <QtCore/QTimer>
+
 // 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"
 

src/mumble/MainWindow.cpp

@@ -45,13 +45,32 @@
 #include "SSLCipherInfo.h"
 #include "Screen.h"
 #include "SvgIcon.h"
+#include "Utils.h"
 
 #ifdef Q_OS_WIN
-#include "TaskList.h"
+# include "TaskList.h"
 #endif
 
 #ifdef Q_OS_MAC
-#include "AppNap.h"
+# include "AppNap.h"
+#endif
+
+#include <QtCore/QStandardPaths>
+#include <QtCore/QUrlQuery>
+#include <QtGui/QClipboard>
+#include <QtGui/QDesktopServices>
+#include <QtGui/QImageReader>
+#include <QtGui/QScreen>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QScrollBar>
+#include <QtWidgets/QToolTip>
+#include <QtWidgets/QWhatsThis>
+
+#ifdef Q_OS_WIN
+# include <dbt.h>
 #endif
 
 // 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.

src/mumble/Messages.cpp

@@ -26,6 +26,7 @@
 #include "VersionCheck.h"
 #include "ViewCert.h"
 #include "CryptState.h"
+#include "Utils.h"
 
 // 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"

src/mumble/MumbleApplication.cpp

@@ -7,13 +7,17 @@
 
 #include "MainWindow.h"
 #include "GlobalShortcut.h"
-#include "Global.h"
 #include "EnvUtils.h"
 
 #if defined(Q_OS_WIN)
 # include "GlobalShortcut_win.h"
 #endif
 
+#include <QtGui/QFileOpenEvent>
+
+// 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"
+
 MumbleApplication *MumbleApplication::instance() {
 	return static_cast<MumbleApplication *>(QCoreApplication::instance());
 }

src/mumble/NetworkConfig.cpp

@@ -8,6 +8,10 @@
 #include "MainWindow.h"
 #include "OSInfo.h"
 
+#include <QtNetwork/QHostAddress>
+#include <QtNetwork/QNetworkProxy>
+#include <QtNetwork/QNetworkAccessManager>
+
 // 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"
 

src/mumble/Overlay.cpp

@@ -16,8 +16,26 @@
 #include "RichTextEditor.h"
 #include "ServerHandler.h"
 #include "User.h"
+#include "Utils.h"
 #include "WebFetch.h"
 
+#include <QtCore/QProcessEnvironment>
+#include <QtCore/QtEndian>
+#include <QtGui/QFocusEvent>
+#include <QtGui/QImageReader>
+#include <QtGui/QImageWriter>
+#include <QtNetwork/QLocalServer>
+#include <QtWidgets/QMessageBox>
+
+#ifdef Q_OS_WIN
+# include <shellapi.h>
+#endif
+
+#ifdef Q_OS_MAC
+# include <ApplicationServices/ApplicationServices.h>
+# include <CoreFoundation/CoreFoundation.h>
+#endif
+
 // 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"
 

src/mumble/OverlayClient.cpp

@@ -16,6 +16,18 @@
 #include "MainWindow.h"
 #include "GlobalShortcut.h"
 #include "Themes.h"
+#include "Utils.h"
+
+#ifdef Q_OS_WIN
+# include <QtGui/QBitmap>
+#endif
+
+#include <QtGui/QImageReader>
+#include <QtWidgets/QGraphicsProxyWidget>
+
+#ifdef Q_OS_WIN
+# include <psapi.h>
+#endif
 
 // 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"

src/mumble/OverlayConfig.cpp

@@ -20,15 +20,22 @@
 #include "PathListWidget.h"
 #include "Screen.h"
 
-// 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"
-
 #ifdef Q_OS_WIN
 #include "../../overlay/overlay_launchers.h"
 #include "../../overlay/overlay_whitelist.h"
 #include "../../overlay/overlay_blacklist.h"
 #endif
 
+#include <QtGui/QScreen>
+#include <QtGui/QWindow>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QFontDialog>
+
+// 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"
+
 static const int OVERLAYCONFIG_PATH_ROLE = Qt::UserRole;
 static const int OVERLAYCONFIG_BUILTIN_ROLE = Qt::UserRole + 1;
 

src/mumble/OverlayEditor.cpp

@@ -15,6 +15,9 @@
 #include "ServerHandler.h"
 #include "MainWindow.h"
 #include "GlobalShortcut.h"
+#include "Utils.h"
+
+#include <QtWidgets/QGraphicsProxyWidget>
 
 // 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"

src/mumble/OverlayEditorScene.cpp

@@ -16,6 +16,13 @@
 #include "ServerHandler.h"
 #include "MainWindow.h"
 #include "GlobalShortcut.h"
+#include "Utils.h"
+
+#include <QtGui/QImageReader>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QFontDialog>
+#include <QtWidgets/QGraphicsProxyWidget>
+#include <QtWidgets/QGraphicsSceneMouseEvent>
 
 // 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"

src/mumble/OverlayPositionableItem.cpp

@@ -5,6 +5,12 @@
 
 #include "OverlayPositionableItem.h"
 
+#include "Utils.h"
+
+#include <QtCore/QEvent>
+#include <QtGui/QPen>
+#include <QtWidgets/QGraphicsScene>
+
 OverlayPositionableItem::OverlayPositionableItem(QRectF *posPtr, const bool isPositionable)
 	: m_position(posPtr)
 	, m_isPositionEditable(isPositionable)

src/mumble/OverlayText.cpp

@@ -5,6 +5,14 @@
 
 #include "OverlayText.h"
 
+#include "Utils.h"
+
+#include <QtCore/QDebug>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+
+// 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"
 
 BasepointPixmap::BasepointPixmap() :

src/mumble/OverlayUser.cpp

@@ -15,6 +15,9 @@
 #include "ServerHandler.h"
 #include "MainWindow.h"
 #include "GlobalShortcut.h"
+#include "Utils.h"
+
+#include <QtGui/QImageReader>
 
 // 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"

src/mumble/OverlayUserGroup.cpp

@@ -18,6 +18,12 @@
 #include "ServerHandler.h"
 #include "MainWindow.h"
 #include "GlobalShortcut.h"
+#include "Utils.h"
+
+#include <QtGui/QImageReader>
+#include <QtWidgets/QGraphicsSceneContextMenuEvent>
+#include <QtWidgets/QGraphicsSceneWheelEvent>
+#include <QtWidgets/QInputDialog>
 
 // 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"

src/mumble/Overlay_macx.mm

@@ -2,13 +2,18 @@
 // Use of this source code is governed by a BSD-style license
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
-#import <ScriptingBridge/ScriptingBridge.h>
-#import <Cocoa/Cocoa.h>
-#include <Carbon/Carbon.h>
+
 #include "OverlayConfig.h"
 #include "OverlayClient.h"
 #include "MainWindow.h"
 
+#include <QtCore/QProcess>
+#include <QtCore/QXmlStreamReader>
+
+#import <ScriptingBridge/ScriptingBridge.h>
+#import <Cocoa/Cocoa.h>
+#include <Carbon/Carbon.h>
+
 // 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"
 

src/mumble/Overlay_win.cpp

@@ -9,13 +9,15 @@
 #include "Channel.h"
 #include "OverlayConfig.h"
 #include "MainWindow.h"
-#include "Global.h"
 #include "MumbleApplication.h"
 
 #include "Overlay_win.h"
 
 #include "../../overlay/overlay_exe/overlay_exe.h"
 
+// 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"
+
 // Used by the overlay to detect whether we injected into ourselves.
 //
 // A similar declaration can be found in mumble_exe's Overlay.cpp,

src/mumble/Overlay_win.h

@@ -6,7 +6,9 @@
 #ifndef MUMBLE_MUMBLE_OVERLAY_WIN_H_
 #define MUMBLE_MUMBLE_OVERLAY_WIN_H_
 
-#include <windows.h>
+#include "Overlay.h"
+
+#include "win.h"
 
 #include <QString>
 #include <QStringList>
@@ -14,8 +16,6 @@
 #include <QTimer>
 #include <QElapsedTimer>
 
-#include "Overlay.h"
-
 class OverlayPrivateWin : public OverlayPrivate {
 	private:
 		Q_OBJECT

src/mumble/PathListWidget.cpp

@@ -5,13 +5,15 @@
 
 #include "PathListWidget.h"
 
-#include <QDragEnterEvent>
-#include <QDragMoveEvent>
-#include <QDropEvent>
-#include <QFile>
-#include <QDir>
 #include "Overlay.h"
 
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QMimeData>
+#include <QtGui/QDragEnterEvent>
+#include <QtGui/QDragMoveEvent>
+#include <QtGui/QDropEvent>
+
 PathListWidget::PathListWidget(QWidget *parent)
 	: QListWidget(parent)
 	, pathType(FILE_EXE) {

src/mumble/Plugins.cpp

@@ -13,6 +13,22 @@
 #include "WebFetch.h"
 #include "MumbleApplication.h"
 #include "ManualPlugin.h"
+#include "Utils.h"
+
+#include <QtCore/QLibrary>
+#include <QtCore/QUrlQuery>
+
+#ifdef Q_OS_WIN
+# include <QtCore/QTemporaryFile>
+#endif
+
+#include <QtWidgets/QMessageBox>
+#include <QtXml/QDomDocument>
+
+#ifdef Q_OS_WIN
+# include <softpub.h>
+# include <tlhelp32.h>
+#endif
 
 // 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"

src/mumble/Plugins.h

@@ -6,17 +6,18 @@
 #ifndef MUMBLE_MUMBLE_PLUGINS_H_
 #define MUMBLE_MUMBLE_PLUGINS_H_
 
+#include "ConfigDialog.h"
+
+#include "ui_Plugins.h"
+
+#ifdef Q_OS_WIN
+# include "win.h"
+#endif
+
 #include <QtCore/QObject>
 #include <QtCore/QMutex>
 #include <QtCore/QReadWriteLock>
 #include <QtCore/QUrl>
-#ifdef Q_OS_WIN
-#include <windows.h>
-#endif
-
-#include "ConfigDialog.h"
-
-#include "ui_Plugins.h"
 
 struct PluginInfo;
 

src/mumble/RichTextEditor.cpp

@@ -9,6 +9,17 @@
 #include "MainWindow.h"
 #include "XMLTools.h"
 
+#include <QtCore/QMimeData>
+#include <QtGui/QImageReader>
+#include <QtGui/QPainter>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QToolTip>
+
+#ifdef Q_OS_WIN
+# include <shlobj.h>
+#endif
+
 // 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"
 

src/mumble/ServerHandler.cpp

@@ -3,6 +3,12 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
+#include <QtCore/QtGlobal>
+
+#ifdef Q_OS_WIN
+# include "win.h"
+#endif
+
 #include "ServerHandler.h"
 
 #include "AudioInput.h"
@@ -22,6 +28,33 @@
 #include "HostAddress.h"
 #include "ServerResolver.h"
 #include "ServerResolverRecord.h"
+#include "Utils.h"
+
+#include <QtCore/QtEndian>
+#include <QtGui/QImageReader>
+#include <QtNetwork/QSslConfiguration>
+#include <QtNetwork/QUdpSocket>
+
+#include <openssl/crypto.h>
+
+#ifdef Q_OS_WIN
+// <delayimp.h> is not protected with an include guard on MinGW, resulting in
+// redefinitions if the PCH header is used.
+// The workaround consists in including the header only if _DELAY_IMP_VER
+// (defined in the header) is not defined.
+# ifndef _DELAY_IMP_VER
+#  include <delayimp.h>
+# endif
+# include <qos2.h>
+# include <wincrypt.h>
+# include <winsock2.h>
+#else
+# if defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
+#  include <netinet/in.h>
+# endif
+# include <netinet/ip.h>
+# include <sys/socket.h>
+#endif
 
 // 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"

src/mumble/ServerHandler.h

@@ -6,6 +6,12 @@
 #ifndef MUMBLE_MUMBLE_SERVERHANDLER_H_
 #define MUMBLE_MUMBLE_SERVERHANDLER_H_
 
+#include <QtCore/QtGlobal>
+
+#ifdef Q_OS_WIN
+# include "win.h"
+#endif
+
 #ifndef Q_MOC_RUN
 # include <boost/accumulators/accumulators.hpp>
 # include <boost/accumulators/statistics/stats.hpp>
@@ -23,10 +29,6 @@
 #include <QtNetwork/QSslCipher>
 #include <QtNetwork/QSslError>
 
-#ifdef Q_OS_WIN
-#include <windows.h>
-#endif
-
 #define SERVERSEND_EVENT 3501
 
 #include "Timer.h"

src/mumble/Settings.cpp

@@ -8,11 +8,20 @@
 #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);

src/mumble/SharedMemory_win.cpp

@@ -5,10 +5,7 @@
 
 #include "SharedMemory.h"
 
-#ifndef _WIN32_WINNT
-#define  _WIN32_WINNT 0x0501
-#include <windows.h>
-#endif
+#include "win.h"
 
 #include <QtCore/QDebug>
 

src/mumble/SocketRPC.cpp

@@ -10,6 +10,11 @@
 #include "MainWindow.h"
 #include "ServerHandler.h"
 
+#include <QtCore/QProcessEnvironment>
+#include <QtCore/QUrlQuery>
+#include <QtNetwork/QLocalServer>
+#include <QtXml/QDomDocument>
+
 // 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"
 

src/mumble/TaskList.cpp

@@ -5,6 +5,15 @@
 
 #include "TaskList.h"
 
+#include "MumbleApplication.h"
+
+#include <QtCore/QFileInfo>
+#include <QtCore/QSettings>
+#include <QtCore/QString>
+#include <QtCore/QUrl>
+#include <QtCore/QUrlQuery>
+
+#include <shlobj.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>

src/mumble/TaskList.h

@@ -6,6 +6,8 @@
 #ifndef MUMBLE_MUMBLE_TASK_LIST_H_
 #define MUMBLE_MUMBLE_TASK_LIST_H_
 
+class QString;
+
 class TaskList {
 	public:
 		static void addToRecentList(QString name, QString user, QString host, int port);

src/mumble/TextToSpeech_unix.cpp

@@ -13,6 +13,9 @@
 # endif
 #endif
 
+#include <QtCore/QLocale>
+
+// 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"
 
 class TextToSpeechPrivate {

src/mumble/ThemeInfo.cpp

@@ -5,6 +5,10 @@
 
 #include "ThemeInfo.h"
 
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QSettings>
+
 QFileInfo ThemeInfo::StyleInfo::getPlatformQss() const {
 #if defined(Q_OS_WIN)
 	return qssFiles.value(QLatin1String("WIN"), defaultQss);

src/mumble/Usage.cpp

@@ -12,6 +12,12 @@
 #include "OSInfo.h"
 #include "Version.h"
 
+#include <QtCore/QTimer>
+#include <QtNetwork/QHostAddress>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+#include <QtXml/QDomElement>
+
 Usage::Usage(QObject *p) : QObject(p) {
 	qbReport.open(QBuffer::ReadWrite);
 	qdsReport.setDevice(&qbReport);

src/mumble/UserEdit.cpp

@@ -5,13 +5,14 @@
 
 #include "UserEdit.h"
 
-#include <QItemSelectionModel>
-
 #include "Channel.h"
 #include "ServerHandler.h"
 #include "User.h"
 #include "UserListModel.h"
 
+#include <QtCore/QItemSelectionModel>
+#include <QtWidgets/QMenu>
+
 // 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"
 

src/mumble/UserInformation.cpp

@@ -11,6 +11,8 @@
 #include "ServerHandler.h"
 #include "ViewCert.h"
 
+#include <QtCore/QUrl>
+
 // 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"
 

src/mumble/UserListModel.cpp

@@ -4,11 +4,18 @@
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
 #include "UserListModel.h"
+
 #include "Channel.h"
 #include "Message.h"
+#include "Utils.h"
+
+#include <algorithm>
+
+#ifdef _MSC_VER
+# include <functional>
+#endif
 
 #include <vector>
-#include <algorithm>
 
 UserListModel::UserListModel(const MumbleProto::UserList& userList, QObject *parent_)
 	: QAbstractTableModel(parent_)

src/mumble/UserLocalVolumeDialog.cpp

@@ -35,10 +35,17 @@
 
 
 #include "UserLocalVolumeDialog.h"
-#include "Global.h"
 #include "ClientUser.h"
 #include "Database.h"
 
+#include <QtGui/QCloseEvent>
+#include <QtWidgets/QPushButton>
+
+#include <cmath>
+
+// 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"
+
 UserLocalVolumeDialog::UserLocalVolumeDialog(unsigned int sessionId,
                                              QMap<unsigned int, UserLocalVolumeDialog *> *qmUserVolTracker)
 	: QDialog(NULL)

src/mumble/UserLockFile.h

@@ -6,10 +6,14 @@
 #ifndef MUMBLE_MUMBLE_LOCKFILE_H_
 #define MUMBLE_MUMBLE_LOCKFILE_H_
 
-#if defined(Q_OS_WIN)
-# include <windows.h>
+#include <QtCore/QtGlobal>
+
+#ifdef Q_OS_WIN
+# include "win.h"
 #endif
 
+#include <QtCore/QString>
+
 /// UserLockFile implements an atomic lock file
 /// that can be used as a mutex between different
 /// processes run by the same user.

src/mumble/UserModel.cpp

@@ -17,6 +17,13 @@
 #include "Usage.h"
 #include "User.h"
 
+#include <QtCore/QMimeData>
+#include <QtCore/QStack>
+#include <QtGui/QImageReader>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QToolTip>
+#include <QtWidgets/QWhatsThis>
+
 // 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"
 

src/mumble/UserView.cpp

@@ -12,6 +12,11 @@
 #include "ServerHandler.h"
 #include "UserModel.h"
 
+#include <QtGui/QDesktopServices>
+#include <QtGui/QHelpEvent>
+#include <QtGui/QPainter>
+#include <QtWidgets/QWhatsThis>
+
 // 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"