Cleanup included files

10 files changed, 19 insertions, 22 deletions

diff --git a/src/kvilib/file/KviFile.cpp b/src/kvilib/file/KviFile.cpp
index e285ed13d..19816bb79 100644
--- a/src/kvilib/file/KviFile.cpp
+++ b/src/kvilib/file/KviFile.cpp
@@ -25,6 +25,7 @@
 
 #include "KviFile.h"
 #include "KviByteOrder.h"
+#include "KviCString.h"
 
 #include <QByteArray>
 
diff --git a/src/kvilib/file/KviFile.h b/src/kvilib/file/KviFile.h
index 0b0d9f554..40004eb20 100644
--- a/src/kvilib/file/KviFile.h
+++ b/src/kvilib/file/KviFile.h
@@ -32,14 +32,12 @@
 
 #include "kvi_settings.h"
 #include "KviHeapObject.h"
-#include "KviCString.h"
 #include "KviPointerList.h"
 #include "kvi_inttypes.h"
 
 #include <QFile>
 
-#include <time.h>
-
+class KviCString;
 class QByteArray;
 
 #define kvi_file_offset_t qlonglong
diff --git a/src/kvilib/file/KviFileUtils.cpp b/src/kvilib/file/KviFileUtils.cpp
index fecbe0b64..8a0d60519 100644
--- a/src/kvilib/file/KviFileUtils.cpp
+++ b/src/kvilib/file/KviFileUtils.cpp
@@ -31,6 +31,8 @@
 
 #include <QDir>
 #include <QFileInfo>
+#include <QString>
+#include <QStringList>
 #include <QtGlobal>
 #include <QTextCodec>
 #include <QTextStream>
diff --git a/src/kvilib/file/KviFileUtils.h b/src/kvilib/file/KviFileUtils.h
index e54896108..b75366965 100644
--- a/src/kvilib/file/KviFileUtils.h
+++ b/src/kvilib/file/KviFileUtils.h
@@ -34,12 +34,12 @@
 */
 
 #include "kvi_settings.h"
-#include "KviCString.h"
 
 #include <QFile>
-#include <QStringList>
 
-#include <time.h>
+class QByteArray;
+class QString;
+class QStringList;
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 #define KVI_PATH_SEPARATOR "\\"
diff --git a/src/kvilib/file/KviPackageIOEngine.cpp b/src/kvilib/file/KviPackageIOEngine.cpp
index da67c2bd4..1e6542933 100644
--- a/src/kvilib/file/KviPackageIOEngine.cpp
+++ b/src/kvilib/file/KviPackageIOEngine.cpp
@@ -26,8 +26,9 @@
 #include "KviLocale.h"
 
 #include <QApplication>
-#include <QProgressDialog>
+#include <QByteArray>
 #include <QLabel>
+#include <QProgressDialog>
 
 //
 // A KVIrc Package File is basically a simple zip file with some additional meta-data.
diff --git a/src/kvilib/file/KviPackageIOEngine.h b/src/kvilib/file/KviPackageIOEngine.h
index 4b941357b..d45e6366a 100644
--- a/src/kvilib/file/KviPackageIOEngine.h
+++ b/src/kvilib/file/KviPackageIOEngine.h
@@ -32,12 +32,11 @@
 
 #include "kvi_settings.h"
 
-#include "KviQString.h"
 #include "KviPointerHashTable.h"
 
-#include <QObject>
-#include <QByteArray>
+#include <QString>
 
+class QByteArray;
 class QProgressDialog;
 class QLabel;
 
diff --git a/src/kvilib/file/KviPackageReader.cpp b/src/kvilib/file/KviPackageReader.cpp
index ce358d38c..63c9a5d48 100644
--- a/src/kvilib/file/KviPackageReader.cpp
+++ b/src/kvilib/file/KviPackageReader.cpp
@@ -23,13 +23,13 @@
 //=============================================================================
 
 #include "KviPackageReader.h"
-
 #include "KviFile.h"
 #include "KviFileUtils.h"
 #include "KviLocale.h"
-
 #include "kvi_inttypes.h"
 
+#include <QString>
+
 #ifdef COMPILE_ZLIB_SUPPORT
 #include <zlib.h>
 #endif
diff --git a/src/kvilib/file/KviPackageReader.h b/src/kvilib/file/KviPackageReader.h
index 75633625e..f6643eb9e 100644
--- a/src/kvilib/file/KviPackageReader.h
+++ b/src/kvilib/file/KviPackageReader.h
@@ -31,11 +31,10 @@
 */
 
 #include "kvi_settings.h"
-
-#include "KviQString.h"
 #include "KviPackageIOEngine.h"
 
 class KviFile;
+class QString;
 
 /**
 * \class KviPackageReader
diff --git a/src/kvilib/file/KviPackageWriter.cpp b/src/kvilib/file/KviPackageWriter.cpp
index f4bc2b3a1..ce1965894 100644
--- a/src/kvilib/file/KviPackageWriter.cpp
+++ b/src/kvilib/file/KviPackageWriter.cpp
@@ -23,15 +23,15 @@
 //=============================================================================
 
 #include "KviPackageWriter.h"
-
 #include "KviFile.h"
 #include "KviFileUtils.h"
 #include "KviLocale.h"
 #include "KviPointerList.h"
-
 #include "kvi_inttypes.h"
 
+#include <QByteArray>
 #include <QDir>
+#include <QString>
 
 #ifdef COMPILE_ZLIB_SUPPORT
 #include <zlib.h>
diff --git a/src/kvilib/file/KviPackageWriter.h b/src/kvilib/file/KviPackageWriter.h
index b736118e1..b419be91d 100644
--- a/src/kvilib/file/KviPackageWriter.h
+++ b/src/kvilib/file/KviPackageWriter.h
@@ -31,17 +31,14 @@
 */
 
 #include "kvi_settings.h"
-
-#include "KviQString.h"
 #include "KviPackageIOEngine.h"
 
-#include <QByteArray>
-
-class QFileInfo;
 class KviFile;
-
 class KviPackageWriterPrivate;
 class KviPackageWriterDataField;
+class QByteArray;
+class QFileInfo;
+class QString;
 
 /**
 * \class KviPackageWriter