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>").

22 files changed, 309 insertions, 99 deletions

diff --git a/src/murmur/About.cpp b/src/murmur/About.cpp
index 49b0f2c20..1a72af15b 100644
--- a/src/murmur/About.cpp
+++ b/src/murmur/About.cpp
@@ -3,15 +3,18 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#if QT_VERSION >= 0x050000
-# include <QtWidgets/QApplication>
-#else
-# include <QtGui/QApplication>
-#endif
-
 #include "About.h"
 #include "Version.h"
 #include "License.h"
+#include "Utils.h"
+
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QTextBrowser>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QVBoxLayout>
 
 AboutDialog::AboutDialog(QWidget *p, AboutDialogOptions options) : QDialog(p) {
 	setWindowTitle(tr("About Murmur"));
diff --git a/src/murmur/Cert.cpp b/src/murmur/Cert.cpp
index 812e77c0a..3a1fe10b1 100644
--- a/src/murmur/Cert.cpp
+++ b/src/murmur/Cert.cpp
@@ -3,10 +3,24 @@
 // 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 "Meta.h"
 #include "Server.h"
 #include "SelfSignedCertificate.h"
 
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+
+#ifdef Q_OS_WIN
+# include <winsock2.h>
+#endif
+
 bool Server::isKeyForCert(const QSslKey &key, const QSslCertificate &cert) {
 	if (key.isNull() || cert.isNull() || (key.type() != QSsl::PrivateKey))
 		return false;
diff --git a/src/murmur/DBus.cpp b/src/murmur/DBus.cpp
index 3423c221f..2de841cce 100644
--- a/src/murmur/DBus.cpp
+++ b/src/murmur/DBus.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 "DBus.h"
 
 #include "Connection.h"
@@ -11,6 +17,20 @@
 #include "ServerUser.h"
 #include "ServerDB.h"
 
+#include <QtCore/QCoreApplication>
+#include <QtCore/QStack>
+#include <QtDBus/QDBusConnectionInterface>
+#include <QtDBus/QDBusInterface>
+#include <QtDBus/QDBusMessage>
+#include <QtDBus/QDBusMetaType>
+#include <QtDBus/QDBusReply>
+
+#ifdef Q_OS_WIN
+# include <winsock2.h>
+#else
+# include <arpa/inet.h>
+#endif
+
 QDBusArgument &operator<<(QDBusArgument &a, const PlayerInfo &s) {
 	a.beginStructure();
 	a << s.session << s.mute << s.deaf << s.suppressed << s.selfMute << s.selfDeaf << s.channel;
diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp
index 70158444c..11e283553 100644
--- a/src/murmur/Messages.cpp
+++ b/src/murmur/Messages.cpp
@@ -15,6 +15,9 @@
 #include "Version.h"
 #include "CryptState.h"
 
+#include <QtCore/QStack>
+#include <QtCore/QtEndian>
+
 #define RATELIMIT(user) \
 	if (user->leakyBucket.ratelimit(1)) { \
 		return; \
diff --git a/src/murmur/Meta.cpp b/src/murmur/Meta.cpp
index ac2daaeff..3baac7a7b 100644
--- a/src/murmur/Meta.cpp
+++ b/src/murmur/Meta.cpp
@@ -15,8 +15,25 @@
 #include "EnvUtils.h"
 #include "FFDHE.h"
 
+#include <QtCore/QCoreApplication>
+#include <QtCore/QSettings>
+
+#ifdef Q_OS_WIN
+# include <QtCore/QStandardPaths>
+#endif
+
+#include <QtNetwork/QHostInfo>
+#include <QtNetwork/QNetworkInterface>
+
 #if defined(USE_QSSLDIFFIEHELLMANPARAMETERS)
-# include <QSslDiffieHellmanParameters>
+# include <QtNetwork/QSslDiffieHellmanParameters>
+#endif
+
+#ifdef Q_OS_WIN
+# include <qos2.h>
+#else
+# include <pwd.h>
+# include <sys/resource.h>
 #endif
 
 MetaParams Meta::mp;
diff --git a/src/murmur/Meta.h b/src/murmur/Meta.h
index f2a1fdcd0..f9af242d9 100644
--- a/src/murmur/Meta.h
+++ b/src/murmur/Meta.h
@@ -6,6 +6,12 @@
 #ifndef MUMBLE_MURMUR_META_H_
 #define MUMBLE_MURMUR_META_H_
 
+#include "Timer.h"
+
+#ifdef Q_OS_WIN
+# include "win.h"
+#endif
+
 #include <QtCore/QDir>
 #include <QtCore/QList>
 #include <QtCore/QUrl>
@@ -14,11 +20,6 @@
 #include <QtNetwork/QSslCertificate>
 #include <QtNetwork/QSslKey>
 #include <QtNetwork/QSslCipher>
-#ifdef Q_OS_WIN
-#include <windows.h>
-#endif
-
-#include "Timer.h"
 
 class Server;
 class QSettings;
diff --git a/src/murmur/MurmurGRPCImpl.cpp b/src/murmur/MurmurGRPCImpl.cpp
index aec6b1d45..f8f204aec 100644
--- a/src/murmur/MurmurGRPCImpl.cpp
+++ b/src/murmur/MurmurGRPCImpl.cpp
@@ -16,6 +16,9 @@
 #include "ServerUser.h"
 #include "Server.h"
 #include "Channel.h"
+#include "Utils.h"
+
+#include <QtCore/QStack>
 
 #include "MurmurRPC.proto.Wrapper.cpp"
 
diff --git a/src/murmur/MurmurGRPCImpl.h b/src/murmur/MurmurGRPCImpl.h
index 420e3209b..3592a62f2 100644
--- a/src/murmur/MurmurGRPCImpl.h
+++ b/src/murmur/MurmurGRPCImpl.h
@@ -7,6 +7,10 @@
 #ifndef MUMBLE_MURMUR_MURMURRPC_H_
 #define MUMBLE_MURMUR_MURMURRPC_H_
 
+#include <QtCore/QCoreApplication>
+
+#include <boost/bind.hpp>
+
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "MurmurRPC.grpc.pb.h"
diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp
index 8a66a0e98..14d4b336f 100644
--- a/src/murmur/MurmurIce.cpp
+++ b/src/murmur/MurmurIce.cpp
@@ -5,12 +5,6 @@
 
 #include "MurmurIce.h"
 
-#include <limits>
-
-#include <Ice/Ice.h>
-#include <Ice/SliceChecksums.h>
-#include <IceUtil/IceUtil.h>
-
 #include "Channel.h"
 #include "Group.h"
 #include "Meta.h"
@@ -20,6 +14,21 @@
 #include "ServerDB.h"
 #include "User.h"
 #include "Ban.h"
+#include "Utils.h"
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QSettings>
+#include <QtCore/QStack>
+
+#include <boost/bind.hpp>
+
+#include <openssl/err.h>
+
+#include <Ice/Ice.h>
+#include <Ice/SliceChecksums.h>
+#include <IceUtil/IceUtil.h>
+
+#include <limits>
 
 using namespace std;
 using namespace Murmur;
diff --git a/src/murmur/MurmurIce.h b/src/murmur/MurmurIce.h
index f780e5eff..86f1196c7 100644
--- a/src/murmur/MurmurIce.h
+++ b/src/murmur/MurmurIce.h
@@ -7,6 +7,13 @@
 #ifndef MUMBLE_MURMUR_MURMURICE_H_
 #define MUMBLE_MURMUR_MURMURICE_H_
 
+#include <QtCore/QtGlobal>
+
+#ifdef Q_OS_WIN
+// To prevent <windows.h> (included by Ice) from including <winsock.h>.
+# define WIN32_LEAN_AND_MEAN
+#endif
+
 #include <QtCore/QList>
 #include <QtCore/QMap>
 #include <QtCore/QMutex>
diff --git a/src/murmur/PBKDF2.cpp b/src/murmur/PBKDF2.cpp
index 2e69b7714..91857ee39 100644
--- a/src/murmur/PBKDF2.cpp
+++ b/src/murmur/PBKDF2.cpp
@@ -34,8 +34,27 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include <QtCore/QtGlobal>
+
+#ifdef Q_OS_WIN
+// <openssl/rand.h> includes <windows.h> without defining NOMINMAX,
+// which breaks our compilation because of the "max" macro.
+#ifndef NOMINMAX
+# define NOMINMAX
+#endif
+#endif
+
 #include "PBKDF2.h"
 
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QLatin1String>
+
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/rand.h>
+
+#include <limits>
+
 int PBKDF2::benchmark() {
 	const QString pseudopass(QLatin1String("aboutAvg"));
 	const QString hexSalt = getSalt(); // Could tolerate not getting a salt here, will likely only make it harder.
diff --git a/src/murmur/RPC.cpp b/src/murmur/RPC.cpp
index 9a4060cb6..f95604d9c 100644
--- a/src/murmur/RPC.cpp
+++ b/src/murmur/RPC.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 "Channel.h"
 #include "Group.h"
 #include "Meta.h"
@@ -11,6 +17,10 @@
 #include "ServerUser.h"
 #include "Version.h"
 
+#ifdef Q_OS_WIN
+# include <winsock2.h>
+#endif
+
 void Server::setUserState(User *pUser, Channel *cChannel, bool mute, bool deaf, bool suppressed, bool prioritySpeaker, const QString& name, const QString &comment) {
 	bool changed = false;
 
diff --git a/src/murmur/Register.cpp b/src/murmur/Register.cpp
index 65860b74a..5911dd701 100644
--- a/src/murmur/Register.cpp
+++ b/src/murmur/Register.cpp
@@ -8,6 +8,10 @@
 #include "Version.h"
 #include "OSInfo.h"
 
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+#include <QtXml/QDomDocument>
+
 void Server::initRegister() {
 	connect(&qtTick, SIGNAL(timeout()), this, SLOT(update()));
 
diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
index db89667fd..7315aab7f 100644
--- a/src/murmur/Server.cpp
+++ b/src/murmur/Server.cpp
@@ -20,12 +20,30 @@
 #include "HostAddress.h"
 
 #ifdef USE_BONJOUR
-#include "BonjourServer.h"
-#include "BonjourServiceRegister.h"
+# include "BonjourServer.h"
+# include "BonjourServiceRegister.h"
+#endif
+
+#include "Utils.h"
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QXmlStreamAttributes>
+#include <QtCore/QtEndian>
+#include <QtNetwork/QHostInfo>
+#include <QtNetwork/QSslConfiguration>
+
+#include <boost/bind.hpp>
+
+#ifdef Q_OS_WIN
+# include <qos2.h>
+# include <ws2tcpip.h>
+#else
+# include <netinet/in.h>
+# include <poll.h>
 #endif
 
 #ifndef MAX
-#define MAX(a,b) ((a)>(b) ? (a):(b))
+# define MAX(a,b) ((a)>(b) ? (a):(b))
 #endif
 
 #define UDP_PACKET_SIZE 1024
diff --git a/src/murmur/Server.h b/src/murmur/Server.h
index 007532b7c..79dd87b07 100644
--- a/src/murmur/Server.h
+++ b/src/murmur/Server.h
@@ -6,6 +6,20 @@
 #ifndef MUMBLE_MURMUR_SERVER_H_
 #define MUMBLE_MURMUR_SERVER_H_
 
+#include <QtCore/QtGlobal>
+
+#ifdef Q_OS_WIN
+# include "win.h"
+#endif
+
+#include "ACL.h"
+#include "Message.h"
+#include "Mumble.pb.h"
+#include "User.h"
+#include "Timer.h"
+#include "HostAddress.h"
+#include "Ban.h"
+
 #ifndef Q_MOC_RUN
 # include <boost/function.hpp>
 #endif
@@ -26,18 +40,11 @@
 #if defined(USE_QSSLDIFFIEHELLMANPARAMETERS)
 # include <QtNetwork/QSslDiffieHellmanParameters>
 #endif
+
 #ifdef Q_OS_WIN
-#include <windows.h>
+# include <winsock2.h>
 #endif
 
-#include "ACL.h"
-#include "Message.h"
-#include "Mumble.pb.h"
-#include "User.h"
-#include "Timer.h"
-#include "HostAddress.h"
-#include "Ban.h"
-
 class BonjourServer;
 class Channel;
 class PacketDataStream;
diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp
index 8966540e0..fbfa5a506 100644
--- a/src/murmur/ServerDB.cpp
+++ b/src/murmur/ServerDB.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 "ServerDB.h"
 
 #include "ACL.h"
@@ -17,6 +23,16 @@
 #include "PBKDF2.h"
 #include "PasswordGenerator.h"
 
+#include <QtCore/QCoreApplication>
+#include <QtSql/QSqlError>
+#include <QtSql/QSqlQuery>
+
+#ifdef Q_OS_WIN
+# include <winsock2.h>
+#else
+# include <arpa/inet.h>
+#endif
+
 #define SQLQUERY(x) ServerDB::query(query, QLatin1String(x), true)
 #define SQLDO(x) ServerDB::exec(query, QLatin1String(x), true)
 #define SQLMAY(x) ServerDB::exec(query, QLatin1String(x), false, false)
diff --git a/src/murmur/ServerUser.cpp b/src/murmur/ServerUser.cpp
index 6646ef940..f74e54d81 100644
--- a/src/murmur/ServerUser.cpp
+++ b/src/murmur/ServerUser.cpp
@@ -3,9 +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 "Server.h"
 #include "ServerUser.h"
+
 #include "Meta.h"
+#include "Server.h"
+
+#ifdef Q_OS_UNIX
+# include "Utils.h"
+#endif
 
 ServerUser::ServerUser(Server *p, QSslSocket *socket) : Connection(p, socket), User(), s(NULL), leakyBucket(p->iMessageLimit, p->iMessageBurst) {
 	sState = ServerUser::Connected;
diff --git a/src/murmur/ServerUser.h b/src/murmur/ServerUser.h
index 09dee4dcb..c0766594c 100644
--- a/src/murmur/ServerUser.h
+++ b/src/murmur/ServerUser.h
@@ -6,13 +6,10 @@
 #ifndef MUMBLE_MURMUR_SERVERUSER_H_
 #define MUMBLE_MURMUR_SERVERUSER_H_
 
-#include <QtCore/QStringList>
-#include <QtCore/QTime>
+#include <QtCore/QtGlobal>
 
-#ifdef Q_OS_UNIX
-#include <sys/socket.h>
-#else
-#include <winsock2.h>
+#ifdef Q_OS_WIN
+# include "win.h"
 #endif
 
 #include "Connection.h"
@@ -20,6 +17,15 @@
 #include "User.h"
 #include "HostAddress.h"
 
+#include <QtCore/QStringList>
+#include <QtCore/QTime>
+
+#ifdef Q_OS_WIN
+# include <winsock2.h>
+#else
+# include <sys/socket.h>
+#endif
+
 // Unfortunately, this needs to be "large enough" to hold
 // enough frames to account for both short-term and
 // long-term "maladjustments".
diff --git a/src/murmur/Tray.cpp b/src/murmur/Tray.cpp
index 47d17de8a..d4c027163 100644
--- a/src/murmur/Tray.cpp
+++ b/src/murmur/Tray.cpp
@@ -11,6 +11,13 @@
 #include "Version.h"
 #include "LogEmitter.h"
 
+#include <QtWidgets/QAction>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QTextBrowser>
+
 Tray::Tray(QObject *p, LogEmitter *logger) : QObject(p) {
 	le = logger;
 
diff --git a/src/murmur/UnixMurmur.cpp b/src/murmur/UnixMurmur.cpp
index 1f29d39f1..5e0c6cbed 100644
--- a/src/murmur/UnixMurmur.cpp
+++ b/src/murmur/UnixMurmur.cpp
@@ -8,6 +8,25 @@
 #include "Meta.h"
 #include "EnvUtils.h"
 
+#include <QtCore/QAbstractEventDispatcher>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QMutex>
+#include <QtCore/QSocketNotifier>
+#include <QtCore/QWaitCondition>
+
+#include <grp.h>
+#include <signal.h>
+
+#ifdef Q_OS_LINUX
+# include <sys/capability.h>
+# include <sys/prctl.h>
+# include <sys/resource.h>
+#endif
+
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 QMutex *LimitTest::qm;
 QWaitCondition *LimitTest::qw;
 QWaitCondition *LimitTest::qstartw;
diff --git a/src/murmur/main.cpp b/src/murmur/main.cpp
index 61529e28a..5572ea67c 100644
--- a/src/murmur/main.cpp
+++ b/src/murmur/main.cpp
@@ -3,14 +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>.
 
-#ifdef Q_OS_WIN
-#include "Tray.h"
-#include "About.h"
+#ifdef USE_DBUS
+# include "DBus.h"
 #endif
 
 #include "Server.h"
 #include "ServerDB.h"
-#include "DBus.h"
 #include "Meta.h"
 #include "Version.h"
 #include "SSL.h"
@@ -18,8 +16,31 @@
 #include "LogEmitter.h"
 #include "EnvUtils.h"
 
-#ifdef Q_OS_UNIX
-#include "UnixMurmur.h"
+#ifdef Q_OS_WIN
+# include "About.h"
+# include "Tray.h"
+
+# include <QtWidgets/QApplication>
+#else
+# include "UnixMurmur.h"
+
+# include <QtCore/QCoreApplication>
+#endif
+
+#include <QtCore/QTextCodec>
+
+#ifdef USE_DBUS
+# include <QtDBus/QDBusError>
+# include <QtDBus/QDBusServer>
+#endif
+
+#include <openssl/crypto.h>
+
+#ifdef Q_OS_WIN
+# include <intrin.h>
+#else
+# include <fcntl.h>
+# include <sys/syslog.h>
 #endif
 
 QFile *qfLog = NULL;
diff --git a/src/murmur/murmur_pch.h b/src/murmur/murmur_pch.h
index 9a8edfae6..eb2405e94 100644
--- a/src/murmur/murmur_pch.h
+++ b/src/murmur/murmur_pch.h
@@ -7,21 +7,21 @@
 #ifndef MUMBLE_MURMUR_MURMUR_PCH_H_
 #define MUMBLE_MURMUR_MURMUR_PCH_H_
 
-#define WIN32_LEAN_AND_MEAN
+#ifdef _MSC_VER
+# define _USE_MATH_DEFINES
+#endif
 
-#define _USE_MATH_DEFINES
+#include <QtCore/QtGlobal>
 
-#ifdef __APPLE__
-#include <CoreFoundation/CoreFoundation.h>
-#include <CoreServices/CoreServices.h>
-#undef check
-#undef TYPE_BOOL
+#ifdef Q_OS_WIN
+# include "win.h"
 #endif
 
-#ifdef __MINGW32__
-#define _WIN32_WINNT 0x0600
-#include <ws2tcpip.h>
-#include <mswsock.h>
+#ifdef __APPLE__
+# include <CoreFoundation/CoreFoundation.h>
+# include <CoreServices/CoreServices.h>
+# undef check
+# undef TYPE_BOOL
 #endif
 
 #include <QtCore/QtCore>
@@ -29,63 +29,60 @@
 #include <QtSql/QtSql>
 #include <QtXml/QtXml>
 #ifdef USE_DBUS
-#include <QtDBus/QtDBus>
+# include <QtDBus/QtDBus>
 #endif
 
 #include "QAtomicIntCompat.h"
 
 #ifdef Q_OS_WIN
-#include <QtGui/QtGui>
-#if QT_VERSION >= 0x050000
-# include "Qt4Compat.h"
-# include <QtWidgets/QtWidgets>
-#endif
-
-#include "../qos2_mingw.h"
-
-#include <winsock2.h>
-#include <qos2.h>
-#include <windows.h>
-#include <shellapi.h>
-#include <delayimp.h>
+# include <QtGui/QtGui>
+# if QT_VERSION >= 0x050000
+#  include "Qt4Compat.h"
+#  include <QtWidgets/QtWidgets>
+# endif
+
+# include <ws2tcpip.h>
+# include <qos2.h>
+# include <shellapi.h>
+# include <delayimp.h>
 extern "C" {
 	void __cpuid(int a[4], int b);
 };
 #endif
 
 #ifdef Q_OS_UNIX
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <syslog.h>
-#ifdef Q_OS_LINUX
-#include <linux/types.h> // needed to work around evil magic stuff in capability.h
-#include <sys/capability.h>
-#include <sys/prctl.h>
-#endif
-#include <pwd.h>
-#include <grp.h>
-#if defined __FreeBSD__ || defined __OpenBSD__
-#include <netinet/in_systm.h>
-#endif
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <errno.h>
-#include <signal.h>
-#include <poll.h>
-#ifdef Q_OS_DARWIN
-#include <poll.h>
-#endif
+# include <stdio.h>
+# include <stdlib.h>
+# include <unistd.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <fcntl.h>
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <sys/time.h>
+# include <sys/resource.h>
+# include <syslog.h>
+# ifdef Q_OS_LINUX
+#  include <linux/types.h> // needed to work around evil magic stuff in capability.h
+#  include <sys/capability.h>
+#  include <sys/prctl.h>
+# endif
+# include <pwd.h>
+# include <grp.h>
+# if defined __FreeBSD__ || defined __OpenBSD__
+#  include <netinet/in_systm.h>
+# endif
+# include <netinet/in.h>
+# include <netinet/ip.h>
+# include <errno.h>
+# include <signal.h>
+# include <poll.h>
+# ifdef Q_OS_DARWIN
+#  include <poll.h>
+# endif
 #endif
 
-#include <math.h>
+#include <cmath>
 
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
@@ -93,7 +90,7 @@ extern "C" {
 #include <boost/weak_ptr.hpp>
 
 #ifdef USE_BONJOUR
-#include <dns_sd.h>
+# include <dns_sd.h>
 #endif
 
 #include <openssl/opensslv.h>