Cleanup included files

42 files changed, 108 insertions, 55 deletions

diff --git a/src/kvilib/ext/KviAnimatedPixmap.cpp b/src/kvilib/ext/KviAnimatedPixmap.cpp
index e0673c70c..202c35c04 100644
--- a/src/kvilib/ext/KviAnimatedPixmap.cpp
+++ b/src/kvilib/ext/KviAnimatedPixmap.cpp
@@ -23,11 +23,8 @@
 //=============================================================================
 
 #include "KviAnimatedPixmap.h"
-#include "kvi_settings.h"
 
 #include <QImageReader>
-#include <QTime>
-#include <QHash>
 
 KviAnimatedPixmap::KviAnimatedPixmap(QString fileName, int iWidth, int iHeight)
     : QObject(),
diff --git a/src/kvilib/ext/KviAnimatedPixmap.h b/src/kvilib/ext/KviAnimatedPixmap.h
index 623165506..6b5a86a52 100644
--- a/src/kvilib/ext/KviAnimatedPixmap.h
+++ b/src/kvilib/ext/KviAnimatedPixmap.h
@@ -24,13 +24,15 @@
 //
 //=============================================================================
 
-#include <QObject>
-#include <QPixmap>
-#include <QList>
-#include <QTimer>
 #include "kvi_settings.h"
 #include "KviAnimatedPixmapCache.h"
 
+#include <QObject>
+#include <QString>
+#include <QTimer>
+
+class QPixmap;
+
 /**
  * This class should not be here, because we already have QMovie
  * with the same functionality.
@@ -67,7 +69,6 @@
 class KVILIB_API KviAnimatedPixmap : public QObject, public KviAnimatedPixmapInterface
 {
 	Q_OBJECT
-
 protected:
 	QString m_szFileName;
 	KviAnimatedPixmapCache::Data * m_pFrameData;
diff --git a/src/kvilib/ext/KviAnimatedPixmapCache.h b/src/kvilib/ext/KviAnimatedPixmapCache.h
index 1e4b3ca2b..fcee84734 100644
--- a/src/kvilib/ext/KviAnimatedPixmapCache.h
+++ b/src/kvilib/ext/KviAnimatedPixmapCache.h
@@ -27,10 +27,11 @@
 #include "kvi_settings.h"
 #include "KviAnimatedPixmapInterface.h"
 
-#include <QMutex>
-#include <QPixmap>
 #include <QMultiHash>
 #include <QMultiMap>
+#include <QMutex>
+#include <QObject>
+#include <QPixmap>
 #include <QTimer>
 
 class KVILIB_API KviAnimatedPixmapCache : public QObject
diff --git a/src/kvilib/ext/KviCommandFormatter.cpp b/src/kvilib/ext/KviCommandFormatter.cpp
index 2ce62246d..af17fa033 100644
--- a/src/kvilib/ext/KviCommandFormatter.cpp
+++ b/src/kvilib/ext/KviCommandFormatter.cpp
@@ -23,8 +23,11 @@
 //=============================================================================
 
 #include "KviCommandFormatter.h"
+#include "KviCString.h"
 #include "KviQString.h"
 
+#include <QStringList>
+
 namespace KviCommandFormatter
 {
 	bool hasLeadingChars(KviCString ** pszArray, char c)
diff --git a/src/kvilib/ext/KviCommandFormatter.h b/src/kvilib/ext/KviCommandFormatter.h
index c378e049b..b16b7199e 100644
--- a/src/kvilib/ext/KviCommandFormatter.h
+++ b/src/kvilib/ext/KviCommandFormatter.h
@@ -24,10 +24,11 @@
 //
 //=============================================================================
 
-#include "KviCString.h"
 #include "kvi_settings.h"
 
-#include <QStringList>
+class KviCString;
+class QChar;
+class QStringList;
 
 namespace KviCommandFormatter
 {
diff --git a/src/kvilib/ext/KviConfigurationFile.cpp b/src/kvilib/ext/KviConfigurationFile.cpp
index 0e70a2854..8b75384a5 100644
--- a/src/kvilib/ext/KviConfigurationFile.cpp
+++ b/src/kvilib/ext/KviConfigurationFile.cpp
@@ -30,6 +30,9 @@
 #include "KviMemory.h"
 #include "KviFile.h"
 
+#include <QColor>
+#include <QRect>
+
 KviConfigurationFile::KviConfigurationFile(const QString & filename, FileMode f, bool bLocal8Bit)
 {
 	m_bLocal8Bit = bLocal8Bit;
diff --git a/src/kvilib/ext/KviConfigurationFile.h b/src/kvilib/ext/KviConfigurationFile.h
index 8e2fb9636..06e625f61 100644
--- a/src/kvilib/ext/KviConfigurationFile.h
+++ b/src/kvilib/ext/KviConfigurationFile.h
@@ -25,21 +25,22 @@
 //
 //=============================================================================
 
-#include "KviCString.h"
 #include "kvi_settings.h"
+#include "KviCString.h"
 #include "KviHeapObject.h"
 #include "KviPointerHashTable.h"
 
 #include <QList>
-#include <QColor>
 #include <QFont>
-#include <QRect>
+#include <QString>
 #include <QStringList>
 
 #define KVI_CONFIG_DEFAULT_GROUP "KVIrc"
 
 class KviPixmap;
 class KviMessageTypeSettings;
+class QColor;
+class QRect;
 
 typedef KviPointerHashTable<QString, QString> KviConfigurationFileGroup;
 typedef KviPointerHashTableIterator<QString, QString> KviConfigurationFileGroupIterator;
diff --git a/src/kvilib/ext/KviCryptEngine.cpp b/src/kvilib/ext/KviCryptEngine.cpp
index 98cdb517f..5b5b101b8 100644
--- a/src/kvilib/ext/KviCryptEngine.cpp
+++ b/src/kvilib/ext/KviCryptEngine.cpp
@@ -23,8 +23,8 @@
 //=============================================================================
 
 #include "KviCryptEngine.h"
-#include "KviLocale.h"
 #include "KviCString.h"
+#include "KviLocale.h"
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 #include "KviMemory.h"
diff --git a/src/kvilib/ext/KviCryptEngineDescription.h b/src/kvilib/ext/KviCryptEngineDescription.h
index b84dff7af..524e1d311 100644
--- a/src/kvilib/ext/KviCryptEngineDescription.h
+++ b/src/kvilib/ext/KviCryptEngineDescription.h
@@ -2,7 +2,7 @@
 #define _KVI_CRYPT_ENGINE_DESC_H_
 //=============================================================================
 //
-//   File : KviCryptEngineManager.h
+//   File : KviCryptEngineDescription.h
 //   Creation date : Wed Dec 29 2010 22:10:05 CEST by Elvio Basello
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -29,10 +29,14 @@
 //
 
 #include "kvi_settings.h"
-#include "KviHeapObject.h"
 
 #ifdef COMPILE_CRYPT_SUPPORT
 
+#include "KviCryptEngine.h"
+#include "KviHeapObject.h"
+
+#include <QString>
+
 class KVILIB_API KviCryptEngineDescription : public KviHeapObject
 {
 public:
diff --git a/src/kvilib/ext/KviCryptEngineManager.h b/src/kvilib/ext/KviCryptEngineManager.h
index d972ecba2..0b07940a9 100644
--- a/src/kvilib/ext/KviCryptEngineManager.h
+++ b/src/kvilib/ext/KviCryptEngineManager.h
@@ -34,6 +34,8 @@ class KviCryptEngineDescription;
 
 #ifdef COMPILE_CRYPT_SUPPORT
 
+class QString;
+
 class KVILIB_API KviCryptEngineManager
 {
 public:
diff --git a/src/kvilib/ext/KviMediaManager.cpp b/src/kvilib/ext/KviMediaManager.cpp
index 45106d8ea..7dc78cd51 100644
--- a/src/kvilib/ext/KviMediaManager.cpp
+++ b/src/kvilib/ext/KviMediaManager.cpp
@@ -25,16 +25,14 @@
 //#define _KVI_DEBUG_CHECK_RANGE_
 
 #include "KviMediaManager.h"
-#include "kvi_debug.h"
 #include "KviConfigurationFile.h"
+#include "KviFile.h"
 #include "KviFileUtils.h"
 #include "KviLocale.h"
-#include "KviFile.h"
-
-#include "kvi_settings.h"
+#include "kvi_debug.h"
 
-#include <QRegExp>
 #include <QDir>
+#include <QRegExp>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/kvilib/ext/KviMediaManager.h b/src/kvilib/ext/KviMediaManager.h
index 2caa6eb8d..1f32d2be6 100644
--- a/src/kvilib/ext/KviMediaManager.h
+++ b/src/kvilib/ext/KviMediaManager.h
@@ -26,10 +26,10 @@
 
 // This file was originally part of KviMediaType.h
 
-#include "KviMediaType.h"
 #include "kvi_settings.h"
-#include "KviThread.h"
+#include "KviMediaType.h"
 #include "KviPointerList.h"
+#include "KviThread.h"
 
 class KVILIB_API KviMediaManager : public KviMutex
 {
diff --git a/src/kvilib/ext/KviMessageTypeSettings.h b/src/kvilib/ext/KviMessageTypeSettings.h
index d6b59eaa3..ae63d6f7d 100644
--- a/src/kvilib/ext/KviMessageTypeSettings.h
+++ b/src/kvilib/ext/KviMessageTypeSettings.h
@@ -25,7 +25,6 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "KviCString.h"
 
 #define KVI_MSGTYPE_MINLEVEL 0
 #define KVI_MSGTYPE_LEVEL_0 0
diff --git a/src/kvilib/ext/KviMiscUtils.cpp b/src/kvilib/ext/KviMiscUtils.cpp
index 3a147ebe4..21e19701a 100644
--- a/src/kvilib/ext/KviMiscUtils.cpp
+++ b/src/kvilib/ext/KviMiscUtils.cpp
@@ -24,6 +24,7 @@
 
 #include "KviMiscUtils.h"
 
+#include <QString>
 #include <QStringList>
 
 namespace KviMiscUtils
diff --git a/src/kvilib/ext/KviMiscUtils.h b/src/kvilib/ext/KviMiscUtils.h
index 5291e2c6f..279243cc1 100644
--- a/src/kvilib/ext/KviMiscUtils.h
+++ b/src/kvilib/ext/KviMiscUtils.h
@@ -31,7 +31,8 @@
 */
 
 #include "kvi_settings.h"
-#include "KviQString.h"
+
+class QString;
 
 /**
 * \namespace KviMiscUtils
diff --git a/src/kvilib/ext/KviNickColors.cpp b/src/kvilib/ext/KviNickColors.cpp
index 3a1b28c1d..974252d1d 100644
--- a/src/kvilib/ext/KviNickColors.cpp
+++ b/src/kvilib/ext/KviNickColors.cpp
@@ -23,9 +23,10 @@
 //=============================================================================
 
 #include "KviNickColors.h"
-
 #include "KviMemory.h"
+
 #include <stdio.h>
+#include <QString>
 
 namespace KviNickColors
 {
diff --git a/src/kvilib/ext/KviNickColors.h b/src/kvilib/ext/KviNickColors.h
index 37e1abfb0..f4fdf89ea 100644
--- a/src/kvilib/ext/KviNickColors.h
+++ b/src/kvilib/ext/KviNickColors.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 
-#include <QString>
+class QString;
 
 namespace KviNickColors
 {
diff --git a/src/kvilib/ext/KviOggTheoraEncoder.cpp b/src/kvilib/ext/KviOggTheoraEncoder.cpp
index 85038890b..ca0ced24d 100644
--- a/src/kvilib/ext/KviOggTheoraEncoder.cpp
+++ b/src/kvilib/ext/KviOggTheoraEncoder.cpp
@@ -29,9 +29,10 @@
 #include "KviOggIrcText.h"
 #include "KviDataBuffer.h"
 
+#include <math.h>
 #include <stdlib.h>
 #include <time.h>
-#include <math.h>
+#include <QColor>
 
 using namespace KviOggIrcText;
 
diff --git a/src/kvilib/ext/KviOggTheoraEncoder.h b/src/kvilib/ext/KviOggTheoraEncoder.h
index 090c18bfe..97f5423ab 100644
--- a/src/kvilib/ext/KviOggTheoraEncoder.h
+++ b/src/kvilib/ext/KviOggTheoraEncoder.h
@@ -39,9 +39,8 @@
 
 #include "theora/theoraenc.h"
 
-#include <QColor>
-
 class KviDataBuffer;
+class QRgb;
 
 /**
 * \def YUV444_BPP Bytes per pixel in a YUV444 image
diff --git a/src/kvilib/ext/KviPixmap.cpp b/src/kvilib/ext/KviPixmap.cpp
index f191ba927..a16ecaf25 100644
--- a/src/kvilib/ext/KviPixmap.cpp
+++ b/src/kvilib/ext/KviPixmap.cpp
@@ -26,6 +26,8 @@
 #include "KviPixmap.h"
 #include "KviQString.h"
 
+#include <QString>
+
 KviPixmap::KviPixmap()
     = default;
 
diff --git a/src/kvilib/ext/KviPixmap.h b/src/kvilib/ext/KviPixmap.h
index 4e1b26fc1..a3c28bd9b 100644
--- a/src/kvilib/ext/KviPixmap.h
+++ b/src/kvilib/ext/KviPixmap.h
@@ -26,9 +26,10 @@
 
 #include "kvi_settings.h"
 
+#include <memory>
 #include <QPixmap>
 
-#include <memory>
+class QString;
 
 class KVILIB_API KviPixmap
 {
diff --git a/src/kvilib/ext/KviPixmapUtils.cpp b/src/kvilib/ext/KviPixmapUtils.cpp
index ad668713e..b026f48c3 100644
--- a/src/kvilib/ext/KviPixmapUtils.cpp
+++ b/src/kvilib/ext/KviPixmapUtils.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : KviPixmapUtils.h
+//   File : KviPixmapUtils.cpp
 //   Creation date : Wed Dec 29 2010 01:10:05 CEST by Elvio Basello
 //
 //   This file is part of the KVIrc IRC client distribution
diff --git a/src/kvilib/ext/KviProxy.cpp b/src/kvilib/ext/KviProxy.cpp
index c5729c631..4df3ad135 100644
--- a/src/kvilib/ext/KviProxy.cpp
+++ b/src/kvilib/ext/KviProxy.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : KviProxy.h
+//   File : KviProxy.cpp
 //   Creation date : Wed Dec 29 2010 01:58:01 by Elvio Basello
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -23,7 +23,6 @@
 //=============================================================================
 
 #include "KviProxy.h"
-#include "KviQString.h"
 #include "KviCString.h"
 
 #include <QStringList>
diff --git a/src/kvilib/ext/KviProxyDataBase.cpp b/src/kvilib/ext/KviProxyDataBase.cpp
index 419b42d4a..4ba770276 100644
--- a/src/kvilib/ext/KviProxyDataBase.cpp
+++ b/src/kvilib/ext/KviProxyDataBase.cpp
@@ -24,8 +24,11 @@
 
 #include "KviProxyDataBase.h"
 #include "KviConfigurationFile.h"
+#include "KviCString.h"
 #include "KviProxy.h"
 
+#include <QString>
+
 void KviProxyDataBase::updateProxyIp(const char * proxy, const char * ip)
 {
 	for(auto & prx : m_pProxyList)
diff --git a/src/kvilib/ext/KviProxyDataBase.h b/src/kvilib/ext/KviProxyDataBase.h
index 826b0662b..35b3af6c0 100644
--- a/src/kvilib/ext/KviProxyDataBase.h
+++ b/src/kvilib/ext/KviProxyDataBase.h
@@ -24,13 +24,15 @@
 //
 //=============================================================================
 
-#include "KviProxy.h"
 #include "kvi_settings.h"
+#include "KviProxy.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
+class QString;
+
 class KVILIB_API KviProxyDataBase
 {
 public:
diff --git a/src/kvilib/ext/KviRegisteredChannel.cpp b/src/kvilib/ext/KviRegisteredChannel.cpp
index 0e6c7fa1a..910136283 100644
--- a/src/kvilib/ext/KviRegisteredChannel.cpp
+++ b/src/kvilib/ext/KviRegisteredChannel.cpp
@@ -25,6 +25,8 @@
 #include "kvi_debug.h"
 #include "KviRegisteredChannel.h"
 
+#include <QString>
+
 KviRegisteredChannel::KviRegisteredChannel(const QString & szName, const QString & szNetMask)
 {
 	m_szName = szName;
diff --git a/src/kvilib/ext/KviRegisteredChannel.h b/src/kvilib/ext/KviRegisteredChannel.h
index df70e5309..d1870a1c4 100644
--- a/src/kvilib/ext/KviRegisteredChannel.h
+++ b/src/kvilib/ext/KviRegisteredChannel.h
@@ -26,10 +26,10 @@
 
 #include "kvi_settings.h"
 #include "KviHeapObject.h"
-#include "KviCString.h"
 #include "KviPointerList.h"
 
 #include <QHash>
+#include <QString>
 
 class KVILIB_API KviRegisteredChannel : public KviHeapObject
 {
diff --git a/src/kvilib/ext/KviRegisteredChannelDataBase.cpp b/src/kvilib/ext/KviRegisteredChannelDataBase.cpp
index 12836d9e1..07f000d9c 100644
--- a/src/kvilib/ext/KviRegisteredChannelDataBase.cpp
+++ b/src/kvilib/ext/KviRegisteredChannelDataBase.cpp
@@ -24,6 +24,9 @@
 
 #include "KviRegisteredChannelDataBase.h"
 #include "KviConfigurationFile.h"
+#include "KviQString.h"
+
+#include <QString>
 
 KviRegisteredChannelDataBase::KviRegisteredChannelDataBase()
 {
diff --git a/src/kvilib/ext/KviRegisteredChannelDataBase.h b/src/kvilib/ext/KviRegisteredChannelDataBase.h
index 86b270cb3..45aedcdba 100644
--- a/src/kvilib/ext/KviRegisteredChannelDataBase.h
+++ b/src/kvilib/ext/KviRegisteredChannelDataBase.h
@@ -31,6 +31,8 @@
 
 #include <QHash>
 
+class QString;
+
 class KVILIB_API KviRegisteredChannelDataBase
 {
 public:
diff --git a/src/kvilib/ext/KviRegisteredUser.cpp b/src/kvilib/ext/KviRegisteredUser.cpp
index fec63aa61..f2575a77d 100644
--- a/src/kvilib/ext/KviRegisteredUser.cpp
+++ b/src/kvilib/ext/KviRegisteredUser.cpp
@@ -25,6 +25,9 @@
 //=============================================================================
 
 #include "KviRegisteredUser.h"
+#include "KviIrcMask.h"
+
+#include <QString>
 
 KviRegisteredUser::KviRegisteredUser(const QString & name)
 {
diff --git a/src/kvilib/ext/KviRegisteredUser.h b/src/kvilib/ext/KviRegisteredUser.h
index d66a48b7c..07f0b0eff 100644
--- a/src/kvilib/ext/KviRegisteredUser.h
+++ b/src/kvilib/ext/KviRegisteredUser.h
@@ -30,9 +30,11 @@
 
 #include "kvi_settings.h"
 #include "KviHeapObject.h"
-#include "KviIrcMask.h"
-#include "KviPointerList.h"
 #include "KviPointerHashTable.h"
+#include "KviPointerList.h"
+
+class KviIrcMask;
+class QString;
 
 class KVILIB_API KviRegisteredUser : public KviHeapObject
 {
diff --git a/src/kvilib/ext/KviRegisteredUserDataBase.cpp b/src/kvilib/ext/KviRegisteredUserDataBase.cpp
index 975969f6d..8469bd2c9 100644
--- a/src/kvilib/ext/KviRegisteredUserDataBase.cpp
+++ b/src/kvilib/ext/KviRegisteredUserDataBase.cpp
@@ -27,8 +27,11 @@
 #include "kvi_debug.h"
 #include "KviRegisteredUserDataBase.h"
 #include "KviConfigurationFile.h"
+#include "KviIrcMask.h"
 #include "KviLocale.h"
 
+#include <QString>
+
 /*
 	@doc: registered_users
 	@title:
diff --git a/src/kvilib/ext/KviRegisteredUserDataBase.h b/src/kvilib/ext/KviRegisteredUserDataBase.h
index 00bd13487..cb2d7fdf6 100644
--- a/src/kvilib/ext/KviRegisteredUserDataBase.h
+++ b/src/kvilib/ext/KviRegisteredUserDataBase.h
@@ -33,13 +33,16 @@
 #include "kvi_settings.h"
 #include "kvi_debug.h"
 
-#include "KviHeapObject.h"
 #include "KviPointerHashTable.h"
 #include "KviRegisteredUserGroup.h"
 #include "KviRegisteredUserMask.h"
+#include "KviRegisteredUser.h"
 
 #include <QObject>
 
+class KviIrcMask;
+class QString;
+
 //
 // KviRegisteredUserDataBase
 //
diff --git a/src/kvilib/ext/KviRegisteredUserMask.cpp b/src/kvilib/ext/KviRegisteredUserMask.cpp
index 03a5c0a0e..917b485c3 100644
--- a/src/kvilib/ext/KviRegisteredUserMask.cpp
+++ b/src/kvilib/ext/KviRegisteredUserMask.cpp
@@ -23,6 +23,8 @@
 //=============================================================================
 
 #include "KviRegisteredUserMask.h"
+#include "KviIrcMask.h"
+#include "KviRegisteredUser.h"
 
 KviRegisteredUserMask::KviRegisteredUserMask(KviRegisteredUser * pUser, KviIrcMask * pMask)
 {
diff --git a/src/kvilib/ext/KviRegisteredUserMask.h b/src/kvilib/ext/KviRegisteredUserMask.h
index 017553f78..9b45a527f 100644
--- a/src/kvilib/ext/KviRegisteredUserMask.h
+++ b/src/kvilib/ext/KviRegisteredUserMask.h
@@ -27,8 +27,10 @@
 // this file was originally part of KviRegisteredUserDataBase.h
 
 #include "kvi_settings.h"
-#include "KviIrcMask.h"
-#include "KviRegisteredUser.h"
+#include "KviPointerList.h"
+
+class KviIrcMask;
+class KviRegisteredUser;
 
 class KVILIB_API KviRegisteredUserMask
 {
diff --git a/src/kvilib/ext/KviRuntimeInfo.cpp b/src/kvilib/ext/KviRuntimeInfo.cpp
index 035191bbc..51938eed5 100644
--- a/src/kvilib/ext/KviRuntimeInfo.cpp
+++ b/src/kvilib/ext/KviRuntimeInfo.cpp
@@ -27,6 +27,7 @@
 #include "KviQString.h"
 
 #include <QApplication>
+#include <QString>
 #include <QStyle>
 
 #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
diff --git a/src/kvilib/ext/KviRuntimeInfo.h b/src/kvilib/ext/KviRuntimeInfo.h
index 424753994..58fc9be1f 100644
--- a/src/kvilib/ext/KviRuntimeInfo.h
+++ b/src/kvilib/ext/KviRuntimeInfo.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 
-#include <QString>
+class QString;
 
 namespace KviRuntimeInfo
 {
diff --git a/src/kvilib/ext/KviSharedFile.cpp b/src/kvilib/ext/KviSharedFile.cpp
index 29127bf26..bbaede770 100644
--- a/src/kvilib/ext/KviSharedFile.cpp
+++ b/src/kvilib/ext/KviSharedFile.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : KviSharedFile.h
+//   File : KviSharedFile.cpp
 //   Creation date : Wed Dec 29 2010 03:40:05 CEST by Elvio Basello
 //
 //   This file is part of the KVIrc IRC client distribution
diff --git a/src/kvilib/ext/KviSharedFilesManager.cpp b/src/kvilib/ext/KviSharedFilesManager.cpp
index f0c33b8ad..f9270eefd 100644
--- a/src/kvilib/ext/KviSharedFilesManager.cpp
+++ b/src/kvilib/ext/KviSharedFilesManager.cpp
@@ -28,6 +28,7 @@
 #include "KviIrcMask.h"
 
 #include <QFileInfo>
+#include <QTimer>
 
 // TODO: Match servers that the file requests come from
 // TODO: Max number of downloads ?
diff --git a/src/kvilib/ext/KviSharedFilesManager.h b/src/kvilib/ext/KviSharedFilesManager.h
index f1a07cedc..3912ebae4 100644
--- a/src/kvilib/ext/KviSharedFilesManager.h
+++ b/src/kvilib/ext/KviSharedFilesManager.h
@@ -28,9 +28,11 @@
 #include "KviPointerHashTable.h"
 #include "KviSharedFile.h"
 
-#include <QTimer>
+#include <QObject>
 
 class KviIrcMask;
+class QString;
+class QTimer;
 
 class KVILIB_API KviSharedFilesManager : public QObject
 {
diff --git a/src/kvilib/ext/KviStringConversion.cpp b/src/kvilib/ext/KviStringConversion.cpp
index cfbdf8acb..5bb63f0f0 100644
--- a/src/kvilib/ext/KviStringConversion.cpp
+++ b/src/kvilib/ext/KviStringConversion.cpp
@@ -24,8 +24,16 @@
 
 #define _KVI_STRINGCONVERSION_CPP_
 #include "KviStringConversion.h"
-
+#include "KviCString.h"
+#include "KviMessageTypeSettings.h"
+#include "KviPixmap.h"
 #include "KviQString.h"
+
+#include <QColor>
+#include <QFont>
+#include <QRect>
+#include <QString>
+#include <QStringList>
 #include <stdio.h>
 
 QString g_szGlobalDir;
diff --git a/src/kvilib/ext/KviStringConversion.h b/src/kvilib/ext/KviStringConversion.h
index 877347c0b..22f16af57 100644
--- a/src/kvilib/ext/KviStringConversion.h
+++ b/src/kvilib/ext/KviStringConversion.h
@@ -25,15 +25,14 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-#include "KviCString.h"
-#include "KviPixmap.h"
-#include "KviMessageTypeSettings.h"
 
-#include <QRect>
-#include <QColor>
-#include <QFont>
-#include <QStringList>
-#include <QString>
+class KviMessageTypeSettings;
+class KviPixmap;
+class QColor;
+class QFont;
+class QRect;
+class QString;
+class QStringList;
 
 namespace KviStringConversion
 {