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

7 files changed, 31 insertions, 16 deletions

diff --git a/src/tests/OverlayTest.cpp b/src/tests/OverlayTest.cpp
index 71dfe6caf..1665da844 100644
--- a/src/tests/OverlayTest.cpp
+++ b/src/tests/OverlayTest.cpp
@@ -2,19 +2,21 @@
  * Overlay drawing test application.
  */
 
-#include <QtCore>
-#include <QtNetwork>
-#include <QtGui>
-#include "SharedMemory.h"
-
 #include "../../overlay/overlay.h"
 
+#include "SharedMemory.h"
 #include "Timer.h"
-#include <ctime>
+
 #ifdef Q_OS_WIN
-#include <windows.h>
+# include "win.h"
 #endif
 
+#include <QtCore>
+#include <QtNetwork>
+#include <QtGui>
+
+#include <ctime>
+
 class OverlayWidget : public QWidget {
 		Q_OBJECT
 
diff --git a/src/tests/Resample.cpp b/src/tests/Resample.cpp
index 5447afab6..7cc693ebc 100644
--- a/src/tests/Resample.cpp
+++ b/src/tests/Resample.cpp
@@ -2,17 +2,23 @@
  * Speex resampling test / information.
  */
 
+#ifdef Q_OS_WIN
+# include "win.h"
+#endif
+
+#include "Timer.h"
+
+#include <QtCore>
+
 #define _USE_MATH_DEFINES
 #include <cmath>
-#include <QtCore>
+
+#include <speex/speex_resampler.h>
+
 #include <ipp.h>
-#include <windows.h>
-#include "Timer.h"
 
 #define ITER 1000
 
-#include <speex/speex_resampler.h>
-
 int main(int argc, char **argv) {
 	ippStaticInit();
 	ippSetNumThreads(1);
diff --git a/src/tests/TestCrypt/TestCrypt.cpp b/src/tests/TestCrypt/TestCrypt.cpp
index 2b67db93e..1aa0f67a4 100644
--- a/src/tests/TestCrypt/TestCrypt.cpp
+++ b/src/tests/TestCrypt/TestCrypt.cpp
@@ -9,6 +9,7 @@
 #include "SSL.h"
 #include "Timer.h"
 #include "CryptState.h"
+#include "Utils.h"
 
 class TestCrypt : public QObject {
 		Q_OBJECT
diff --git a/src/tests/TestCrypt/TestCrypt.pro b/src/tests/TestCrypt/TestCrypt.pro
index 4d8796493..09746edb7 100644
--- a/src/tests/TestCrypt/TestCrypt.pro
+++ b/src/tests/TestCrypt/TestCrypt.pro
@@ -10,3 +10,5 @@ QT *= network
 TARGET = TestCrypt
 HEADERS *= SSL.h SSLLocks.h Timer.h CryptState.h
 SOURCES *= SSL.cpp SSLLocks.cpp TestCrypt.cpp CryptState.cpp Timer.cpp
+
+win32:LIBS *= -lws2_32
diff --git a/src/tests/TestLink.cpp b/src/tests/TestLink.cpp
index 470cbe928..9249f9315 100644
--- a/src/tests/TestLink.cpp
+++ b/src/tests/TestLink.cpp
@@ -8,11 +8,11 @@
 
 #include <QtCore>
 
-#ifdef WIN32
-#include <windows.h>
+#ifdef Q_OS_WIN
+# include "win.h"
 #else
-#include <fcntl.h>
-#include <sys/mman.h>
+# include <fcntl.h>
+# include <sys/mman.h>
 #endif
 
 struct LinkedMem {
diff --git a/src/tests/TestServerAddress/TestServerAddress.pro b/src/tests/TestServerAddress/TestServerAddress.pro
index beda32c00..705982351 100644
--- a/src/tests/TestServerAddress/TestServerAddress.pro
+++ b/src/tests/TestServerAddress/TestServerAddress.pro
@@ -10,3 +10,5 @@ QT += network
 TARGET = TestServerAddress
 SOURCES *= TestServerAddress.cpp ServerAddress.cpp HostAddress.cpp
 HEADERS *= ServerAddress.h HostAddress.h
+
+win32:LIBS *= -lws2_32
diff --git a/src/tests/TestServerResolver/TestServerResolver.pro b/src/tests/TestServerResolver/TestServerResolver.pro
index c59100c35..eab330173 100644
--- a/src/tests/TestServerResolver/TestServerResolver.pro
+++ b/src/tests/TestServerResolver/TestServerResolver.pro
@@ -21,3 +21,5 @@ CONFIG(no-srv) {
   SOURCES -= ServerResolver_qt5.cpp
   SOURCES *= ServerResolver_nosrv.cpp
 }
+
+win32:LIBS *= -lws2_32