14 files changed, 38 insertions, 30 deletions
diff --git a/src/kvilib/net/KviDnsResolver.cpp b/src/kvilib/net/KviDnsResolver.cpp
index cfa526f9f..530f139ef 100644
--- a/src/kvilib/net/KviDnsResolver.cpp
+++ b/src/kvilib/net/KviDnsResolver.cpp
@@ -25,6 +25,7 @@
 #include "KviDnsResolver.h"
 #include "KviError.h"
 #include "KviNetUtils.h"
+#include "KviQString.h"
 
 #include <QApplication>
 
diff --git a/src/kvilib/net/KviDnsResolver.h b/src/kvilib/net/KviDnsResolver.h
index 7caf84d47..c1458b967 100644
--- a/src/kvilib/net/KviDnsResolver.h
+++ b/src/kvilib/net/KviDnsResolver.h
@@ -25,10 +25,11 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "KviHeapObject.h"
-#include "KviQString.h"
 #include "KviError.h"
+#include "KviHeapObject.h"
 
+#include <QObject>
+#include <QString>
 #include <vector>
 
 class KviDnsResolverThread;
@@ -149,8 +150,8 @@ signals:
 // INTERNAL CLASSES
 //
 
-#include <QThread>
 #include <QEvent>
+#include <QThread>
 
 #include "kvi_debug.h"
 
@@ -175,7 +176,7 @@ public:
 	KviDnsResolverResult * releaseResult()
 	{
 		KviDnsResolverResult * pResult = m_pResult;
-		m_pResult = NULL;
+		m_pResult = nullptr;
 		return pResult;
 	}
 };
diff --git a/src/kvilib/net/KviDnsResolverNew.cpp b/src/kvilib/net/KviDnsResolverNew.cpp
index 67c190920..f6d3adc31 100644
--- a/src/kvilib/net/KviDnsResolverNew.cpp
+++ b/src/kvilib/net/KviDnsResolverNew.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : KviDnsResolver.cpp
+//   File : KviDnsResolverNew.cpp
 //   Creation date : Sat Jul 21 2000 17:19:31 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -23,12 +23,11 @@
 //=============================================================================
 
 #include "KviDnsResolver.h"
-
 #include "KviLocale.h"
-
 #include "kvi_debug.h"
 
 #include <QHostInfo>
+#include <QString>
 
 class KviDnsResolverPrivate
 {
diff --git a/src/kvilib/net/KviDnsResolverNew.h b/src/kvilib/net/KviDnsResolverNew.h
index 8b6684d27..067397ef7 100644
--- a/src/kvilib/net/KviDnsResolverNew.h
+++ b/src/kvilib/net/KviDnsResolverNew.h
@@ -2,7 +2,7 @@
 #define _KviDnsResolver_h_
 //=============================================================================
 //
-//   File : KviDnsResolver.h
+//   File : KviDnsResolverNew.h
 //   Creation date : Sat Jul 21 2000 13:59:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -36,15 +36,14 @@
 // Check it again with newer Qt versions and verify.
 
 #include "kvi_settings.h"
-
-#include <KviError.h> // FIXME: Get rid of this at all..
-#include <KviPointerList.h>
+#include "KviError.h" // FIXME: Get rid of this at all..
+#include "KviPointerList.h"
 
 #include <QObject>
 
 class KviDnsResolverPrivate;
-
 class QHostInfo;
+class QString;
 
 ///
 /// \class KviDnsResolver
@@ -55,12 +54,11 @@ class QHostInfo;
 class KVILIB_API KviDnsResolver : public QObject
 {
 	Q_OBJECT
-
 public:
 	///
 	/// Creates an instance of KviDnsResolver
 	///
-	KviDnsResolver(QObject * pParent = NULL);
+	KviDnsResolver(QObject * pParent = nullptr);
 
 	///
 	/// Destroys the instance of KviDnsResolver
diff --git a/src/kvilib/net/KviHttpRequest.cpp b/src/kvilib/net/KviHttpRequest.cpp
index 9f6c9cd17..ae1804921 100644
--- a/src/kvilib/net/KviHttpRequest.cpp
+++ b/src/kvilib/net/KviHttpRequest.cpp
@@ -23,23 +23,25 @@
 //=============================================================================
 
 #include "KviHttpRequest.h"
-#include "KviLocale.h"
-#include "KviNetUtils.h"
+#include "KviCString.h"
+#include "KviDataBuffer.h"
 #include "KviDnsResolver.h"
 #include "KviError.h"
-#include "kvi_debug.h"
-#include "KviTimeUtils.h"
-#include "KviDataBuffer.h"
 #include "KviFile.h"
+#include "KviLocale.h"
+#include "KviNetUtils.h"
+#include "KviTimeUtils.h"
+#include "kvi_debug.h"
 
 #include <QTcpSocket>
 #ifdef COMPILE_SSL_SUPPORT
 #include <QSslSocket>
 #endif
-#include <QTimer>
 #include <QDir>
 #include <QHostAddress>
+#include <QString>
 #include <QStringList>
+#include <QTimer>
 
 //#include <zlib.h>
 
diff --git a/src/kvilib/net/KviHttpRequest.h b/src/kvilib/net/KviHttpRequest.h
index 3a3326f7d..6d165d011 100644
--- a/src/kvilib/net/KviHttpRequest.h
+++ b/src/kvilib/net/KviHttpRequest.h
@@ -34,14 +34,13 @@
 #include <QTextStream> // with automoc we need this to be included before the other files
 
 #include "KviHeapObject.h"
-#include "KviCString.h"
-#include "KviUrl.h"
 #include "KviPointerHashTable.h"
+#include "KviUrl.h"
 
+#include <QAbstractSocket>
 #include <QObject>
 
-#include <QtNetwork/QAbstractSocket>
-
+class KviCString;
 class KviDnsResolver;
 class KviDataBuffer;
 
diff --git a/src/kvilib/net/KviNetUtils.cpp b/src/kvilib/net/KviNetUtils.cpp
index 9353601a3..82b5804d9 100644
--- a/src/kvilib/net/KviNetUtils.cpp
+++ b/src/kvilib/net/KviNetUtils.cpp
@@ -25,8 +25,10 @@
 #define _KVI_NETUTILS_CPP_
 
 #include "KviNetUtils.h"
+#include "KviCString.h"
 #include "KviMemory.h"
 
+#include <QString>
 #include <QStringList>
 
 #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
diff --git a/src/kvilib/net/KviNetUtils.h b/src/kvilib/net/KviNetUtils.h
index 0a7145886..a01923570 100644
--- a/src/kvilib/net/KviNetUtils.h
+++ b/src/kvilib/net/KviNetUtils.h
@@ -51,7 +51,7 @@
 #include <arpa/inet.h>  //inet_ntoa inet_ntop and inet_pton depend on this one.
 #endif
 
-#include "KviCString.h"
+class QString;
 
 class KVILIB_API KviSockaddr
 {
diff --git a/src/kvilib/net/KviNetworkAccessManager.cpp b/src/kvilib/net/KviNetworkAccessManager.cpp
index c3409afc4..dc8d9ec51 100644
--- a/src/kvilib/net/KviNetworkAccessManager.cpp
+++ b/src/kvilib/net/KviNetworkAccessManager.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : KviNetworkAccessManager.h
+//   File : KviNetworkAccessManager.cpp
 //   Creation date : Sat Sep 29 2012 17:15:12 CEST by Fabio Bas
 //
 //   This file is part of the KVIrc IRC client distribution
diff --git a/src/kvilib/net/KviSASL.cpp b/src/kvilib/net/KviSASL.cpp
index 7e37e284a..9ea64ffe4 100644
--- a/src/kvilib/net/KviSASL.cpp
+++ b/src/kvilib/net/KviSASL.cpp
@@ -24,8 +24,11 @@
 
 #include "KviSASL.h"
 
+#include "KviCString.h"
 #include "KviMemory.h"
 
+#include <QByteArray>
+
 namespace KviSASL
 {
 
diff --git a/src/kvilib/net/KviSASL.h b/src/kvilib/net/KviSASL.h
index 86f7aa0f5..8c177329d 100644
--- a/src/kvilib/net/KviSASL.h
+++ b/src/kvilib/net/KviSASL.h
@@ -25,7 +25,9 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "KviCString.h"
+
+class KviCString;
+class QByteArray;
 
 /**
 * \namespace KviSASL
diff --git a/src/kvilib/net/KviSSL.h b/src/kvilib/net/KviSSL.h
index fa7c705b1..6c7798d29 100644
--- a/src/kvilib/net/KviSSL.h
+++ b/src/kvilib/net/KviSSL.h
@@ -29,9 +29,8 @@
 #ifdef COMPILE_SSL_SUPPORT
 
 #include "KviCString.h"
-#include "kvi_sockettype.h"
-
 #include "KviPointerHashTable.h"
+#include "kvi_sockettype.h"
 
 // Apple deprecated openssl since osx 10.7:
 
diff --git a/src/kvilib/net/KviUrl.cpp b/src/kvilib/net/KviUrl.cpp
index 6a1779b2d..5de804a80 100644
--- a/src/kvilib/net/KviUrl.cpp
+++ b/src/kvilib/net/KviUrl.cpp
@@ -23,6 +23,7 @@
 //=============================================================================
 
 #include "KviUrl.h"
+
 #include <QUrl>
 
 KviUrl::KviUrl()
diff --git a/src/kvilib/net/KviUrl.h b/src/kvilib/net/KviUrl.h
index 4871e1cf6..0c98c7989 100644
--- a/src/kvilib/net/KviUrl.h
+++ b/src/kvilib/net/KviUrl.h
@@ -24,10 +24,11 @@
 //
 //=============================================================================
 
-#include "KviCString.h"
 #include "KviHeapObject.h"
 #include "kvi_inttypes.h"
 
+#include <QString>
+
 class KVILIB_API KviUrl : public KviHeapObject
 {
 public: