diff --git a/krusader/ActionMan/addplaceholderpopup.h b/krusader/ActionMan/addplaceholderpopup.h
--- a/krusader/ActionMan/addplaceholderpopup.h
+++ b/krusader/ActionMan/addplaceholderpopup.h
@@ -23,13 +23,13 @@
 
 // QtCore
 #include <QList>
+#include <QString>
 // QtWidgets
 #include <QDialog>
 #include <QMenu>
 
 #include "../UserAction/expander.h"
 
-class QString;
 class KLineEdit;
 class QToolButton;
 class QCheckBox;
diff --git a/krusader/ActionMan/addplaceholderpopup.cpp b/krusader/ActionMan/addplaceholderpopup.cpp
--- a/krusader/ActionMan/addplaceholderpopup.cpp
+++ b/krusader/ActionMan/addplaceholderpopup.cpp
@@ -20,7 +20,6 @@
 
 #include "addplaceholderpopup.h"
 
-#include "../UserAction/expander.h"
 // for ParameterDialog
 #include "../krglobal.h" // for konfig-access
 #include "../BookMan/krbookmarkbutton.h"
diff --git a/krusader/BookMan/kraddbookmarkdlg.h b/krusader/BookMan/kraddbookmarkdlg.h
--- a/krusader/BookMan/kraddbookmarkdlg.h
+++ b/krusader/BookMan/kraddbookmarkdlg.h
@@ -21,7 +21,6 @@
 #define KRADDBOOKMARKDLG_H
 
 #include "krbookmark.h"
-#include "../VFS/vfs.h"
 #include "../GUI/krtreewidget.h"
 
 // QtCore
diff --git a/krusader/BookMan/krbookmarkbutton.h b/krusader/BookMan/krbookmarkbutton.h
--- a/krusader/BookMan/krbookmarkbutton.h
+++ b/krusader/BookMan/krbookmarkbutton.h
@@ -25,8 +25,6 @@
 
 #include <KWidgetsAddons/KActionMenu>
 
-#include "krbookmarkhandler.h"
-
 class KrBookmarkButton: public QToolButton
 {
     Q_OBJECT
diff --git a/krusader/BookMan/krbookmarkhandler.cpp b/krusader/BookMan/krbookmarkhandler.cpp
--- a/krusader/BookMan/krbookmarkhandler.cpp
+++ b/krusader/BookMan/krbookmarkhandler.cpp
@@ -19,6 +19,8 @@
 
 #include "krbookmarkhandler.h"
 #include "kraddbookmarkdlg.h"
+
+#include "../krglobal.h"
 #include "../krslots.h"
 #include "../kractions.h"
 #include "../filemanagerwindow.h"
diff --git a/krusader/Dialogs/krspwidgets.h b/krusader/Dialogs/krspwidgets.h
--- a/krusader/Dialogs/krspwidgets.h
+++ b/krusader/Dialogs/krspwidgets.h
@@ -42,8 +42,6 @@
 #include "newftpgui.h"
 #include "../VFS/krquery.h"
 
-class newFTPGUI;
-
 class KRMaskChoiceSub;
 
 class KRSpWidgets
diff --git a/krusader/Dialogs/packguibase.h b/krusader/Dialogs/packguibase.h
--- a/krusader/Dialogs/packguibase.h
+++ b/krusader/Dialogs/packguibase.h
@@ -39,7 +39,6 @@
 #include <QVBoxLayout>
 #include <QLabel>
 
-class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QCheckBox;
diff --git a/krusader/DiskUsage/filelightParts/fileTree.h b/krusader/DiskUsage/filelightParts/fileTree.h
--- a/krusader/DiskUsage/filelightParts/fileTree.h
+++ b/krusader/DiskUsage/filelightParts/fileTree.h
@@ -19,6 +19,8 @@
 #ifndef FILETREE_H
 #define FILETREE_H
 
+#include <QString>
+
 #include <KIO/Global>
 
 // TODO these are pointlessly general purpose now, make them incredibly specific
@@ -202,7 +204,6 @@
 
 
 class Directory;
-class QString;
 
 class File
 {
diff --git a/krusader/DiskUsage/radialMap/builder.cpp b/krusader/DiskUsage/radialMap/builder.cpp
--- a/krusader/DiskUsage/radialMap/builder.cpp
+++ b/krusader/DiskUsage/radialMap/builder.cpp
@@ -18,7 +18,6 @@
 
 #include "builder.h"
 #include "Config.h"
-#include "fileTree.h"
 #include "widget.h"
 
 // QtCore
diff --git a/krusader/Filter/advancedfilter.h b/krusader/Filter/advancedfilter.h
--- a/krusader/Filter/advancedfilter.h
+++ b/krusader/Filter/advancedfilter.h
@@ -32,7 +32,6 @@
 #define ADVANCEDFILTER_H
 
 #include "filterbase.h"
-#include "../VFS/krquery.h"
 
 // QtWidgets
 #include <QWidget>
diff --git a/krusader/Filter/filterbase.h b/krusader/Filter/filterbase.h
--- a/krusader/Filter/filterbase.h
+++ b/krusader/Filter/filterbase.h
@@ -32,7 +32,6 @@
 #define FILTERBASE_H
 
 #include "filtersettings.h"
-#include "../VFS/krquery.h"
 
 // QtCore
 #include <QString>
diff --git a/krusader/Filter/generalfilter.h b/krusader/Filter/generalfilter.h
--- a/krusader/Filter/generalfilter.h
+++ b/krusader/Filter/generalfilter.h
@@ -44,7 +44,6 @@
 #include <KCompletion/KHistoryComboBox>
 
 #include "filterbase.h"
-#include "../VFS/krquery.h"
 #include "../Dialogs/kurllistrequester.h"
 #include "../GUI/profilemanager.h"
 #include "../GUI/krlistwidget.h"
diff --git a/krusader/KViewer/krviewer.cpp b/krusader/KViewer/krviewer.cpp
--- a/krusader/KViewer/krviewer.cpp
+++ b/krusader/KViewer/krviewer.cpp
@@ -44,7 +44,6 @@
 #include <KXmlGui/KShortcutsDialog>
 #include <KXmlGui/KToolBar>
 
-#include "../krglobal.h"
 #include "../defaults.h"
 #include "../kicons.h"
 #include "panelviewer.h"
diff --git a/krusader/Konfigurator/kgarchives.cpp b/krusader/Konfigurator/kgarchives.cpp
--- a/krusader/Konfigurator/kgarchives.cpp
+++ b/krusader/Konfigurator/kgarchives.cpp
@@ -43,6 +43,7 @@
 #include "krresulttabledialog.h"
 #include "searchobject.h"
 #include "../defaults.h"
+#include "../krglobal.h"
 #include "../VFS/krarchandler.h"
 
 KgArchives::KgArchives(bool first, QWidget* parent) :
diff --git a/krusader/Konfigurator/kggeneral.cpp b/krusader/Konfigurator/kggeneral.cpp
--- a/krusader/Konfigurator/kggeneral.cpp
+++ b/krusader/Konfigurator/kggeneral.cpp
@@ -49,6 +49,7 @@
 #include "krresulttabledialog.h"
 #include "../defaults.h"
 #include "../kicons.h"
+#include "../krglobal.h"
 
 #define PAGE_GENERAL        0
 #define PAGE_VIEWER         1
diff --git a/krusader/Konfigurator/konfiguratorpage.h b/krusader/Konfigurator/konfiguratorpage.h
--- a/krusader/Konfigurator/konfiguratorpage.h
+++ b/krusader/Konfigurator/konfiguratorpage.h
@@ -41,8 +41,6 @@
 #include "konfiguratoritems.h"
 
 struct KONFIGURATOR_CHECKBOX_PARAM;
-struct KONFIGURATOR_NAME_VALUE_TIP;
-struct KONFIGURATOR_NAME_VALUE_PAIR;
 
 /**
   * KonfiguratorPage is responsible for handling pages in Konfigurator.
diff --git a/krusader/Konfigurator/krresulttable.h b/krusader/Konfigurator/krresulttable.h
--- a/krusader/Konfigurator/krresulttable.h
+++ b/krusader/Konfigurator/krresulttable.h
@@ -33,9 +33,6 @@
 #include <KWidgetsAddons/KUrlLabel>
 
 #include "searchobject.h"
-#include "../krglobal.h"
-#include "../krservices.h"
-#include "../VFS/krarchandler.h"
 
 class KrResultTable : public QWidget
 {
diff --git a/krusader/Konfigurator/krresulttable.cpp b/krusader/Konfigurator/krresulttable.cpp
--- a/krusader/Konfigurator/krresulttable.cpp
+++ b/krusader/Konfigurator/krresulttable.cpp
@@ -31,6 +31,9 @@
 
 #include <KI18n/KLocalizedString>
 
+#include "../krservices.h"
+#include "../VFS/krarchandler.h"
+
 using namespace std;
 
 #define PS(x) _supported.contains(x)>0
diff --git a/krusader/Konfigurator/krresulttabledialog.cpp b/krusader/Konfigurator/krresulttabledialog.cpp
--- a/krusader/Konfigurator/krresulttabledialog.cpp
+++ b/krusader/Konfigurator/krresulttabledialog.cpp
@@ -30,6 +30,8 @@
 #include <KConfigWidgets/KHelpClient>
 #include <KIconThemes/KIconLoader>
 
+#include "../krglobal.h"
+
 KrResultTableDialog::KrResultTableDialog(QWidget *parent, DialogType type,
         const QString& caption, const QString& heading, const QString& headerIcon,
         const QString& hint)
diff --git a/krusader/Konfigurator/searchobject.h b/krusader/Konfigurator/searchobject.h
--- a/krusader/Konfigurator/searchobject.h
+++ b/krusader/Konfigurator/searchobject.h
@@ -23,8 +23,6 @@
 #include <QString>
 #include <QList>
 
-# include "../krservices.h"
-
 class SearchObject
 {
 public:
diff --git a/krusader/Konfigurator/searchobject.cpp b/krusader/Konfigurator/searchobject.cpp
--- a/krusader/Konfigurator/searchobject.cpp
+++ b/krusader/Konfigurator/searchobject.cpp
@@ -18,6 +18,8 @@
 
 #include "searchobject.h"
 
+#include "../krservices.h"
+
 SearchObject::SearchObject()
 {
 }
diff --git a/krusader/MountMan/kmountman.h b/krusader/MountMan/kmountman.h
--- a/krusader/MountMan/kmountman.h
+++ b/krusader/MountMan/kmountman.h
@@ -48,7 +48,6 @@
 #include <Solid/SolidNamespace>
 
 class KMountManGUI;
-class QAction;
 class KToolBarPopupAction;
 
 class KMountMan : public QObject
diff --git a/krusader/MountMan/kmountmangui.cpp b/krusader/MountMan/kmountmangui.cpp
--- a/krusader/MountMan/kmountmangui.cpp
+++ b/krusader/MountMan/kmountmangui.cpp
@@ -29,9 +29,7 @@
 ***************************************************************************/
 
 
-
 #include "kmountmangui.h"
-#include "kmountman.h"
 #include "../krglobal.h"
 #include "../Dialogs/krspecialwidgets.h"
 #include "../kicons.h"
diff --git a/krusader/Panel/krinterdetailedview.cpp b/krusader/Panel/krinterdetailedview.cpp
--- a/krusader/Panel/krinterdetailedview.cpp
+++ b/krusader/Panel/krinterdetailedview.cpp
@@ -39,6 +39,7 @@
 #include "krvfsmodel.h"
 #include "../VFS/krpermhandler.h"
 #include "../defaults.h"
+#include "../krglobal.h"
 #include "krmousehandler.h"
 #include "krcolorcache.h"
 #include "../GUI/krstyleproxy.h"
diff --git a/krusader/Panel/krinterviewitem.h b/krusader/Panel/krinterviewitem.h
--- a/krusader/Panel/krinterviewitem.h
+++ b/krusader/Panel/krinterviewitem.h
@@ -23,9 +23,9 @@
 // QtWidgets
 #include <QAbstractItemView>
 
-#include "krviewitem.h"
+#include "krinterview.h"
 #include "krvfsmodel.h"
-
+#include "krviewitem.h"
 
 // dummy. remove this class when no longer needed
 class KrInterViewItem: public KrViewItem
diff --git a/krusader/Panel/krinterviewitemdelegate.cpp b/krusader/Panel/krinterviewitemdelegate.cpp
--- a/krusader/Panel/krinterviewitemdelegate.cpp
+++ b/krusader/Panel/krinterviewitemdelegate.cpp
@@ -17,7 +17,9 @@
  *****************************************************************************/
 
 #include "krinterviewitemdelegate.h"
+
 #include "krvfsmodel.h"
+#include "../krglobal.h"
 
 // QtGui
 #include <QPainter>
diff --git a/krusader/Panel/krpopupmenu.h b/krusader/Panel/krpopupmenu.h
--- a/krusader/Panel/krpopupmenu.h
+++ b/krusader/Panel/krpopupmenu.h
@@ -32,8 +32,6 @@
 #endif
 
 #include "krpreviewpopup.h"
-#include "krviewitem.h"
-#include "../UserAction/useractionpopupmenu.h"
 
 class KActionCollection;
 class KrPanel;
diff --git a/krusader/Panel/krpopupmenu.cpp b/krusader/Panel/krpopupmenu.cpp
--- a/krusader/Panel/krpopupmenu.cpp
+++ b/krusader/Panel/krpopupmenu.cpp
@@ -44,6 +44,7 @@
 #include "../krusaderview.h"
 #include "../panelmanager.h"
 #include "../krtrashhandler.h"
+#include "../UserAction/useractionpopupmenu.h"
 #include "../VFS/krarchandler.h"
 
 #ifdef __LIBKONQ__
diff --git a/krusader/Panel/krpreviewjob.h b/krusader/Panel/krpreviewjob.h
--- a/krusader/Panel/krpreviewjob.h
+++ b/krusader/Panel/krpreviewjob.h
@@ -43,8 +43,6 @@
 
 #include "krpreviews.h"
 
-
-class KrView;
 class KrViewItem;
 class KrPreviews;
 
diff --git a/krusader/Panel/krpreviewjob.cpp b/krusader/Panel/krpreviewjob.cpp
--- a/krusader/Panel/krpreviewjob.cpp
+++ b/krusader/Panel/krpreviewjob.cpp
@@ -29,7 +29,6 @@
 ***************************************************************************/
 
 #include "krpreviewjob.h"
-#include "krpreviews.h"
 
 #include "krview.h"
 #include "krviewitem.h"
diff --git a/krusader/Panel/krsort.cpp b/krusader/Panel/krsort.cpp
--- a/krusader/Panel/krsort.cpp
+++ b/krusader/Panel/krsort.cpp
@@ -23,7 +23,6 @@
 #include <QMimeDatabase>
 #include <QMimeType>
 
-#include "krview.h"
 #include "../VFS/krpermhandler.h"
 
 namespace KrSort {
diff --git a/krusader/Panel/krvfsmodel.cpp b/krusader/Panel/krvfsmodel.cpp
--- a/krusader/Panel/krvfsmodel.cpp
+++ b/krusader/Panel/krvfsmodel.cpp
@@ -34,7 +34,6 @@
 
 #include "krpanel.h"
 #include "krcolorcache.h"
-#include "krsort.h"
 
 
 KrVfsModel::KrVfsModel(KrInterView * view): QAbstractListModel(0), _extensionEnabled(true), _view(view),
diff --git a/krusader/Panel/krview.h b/krusader/Panel/krview.h
--- a/krusader/Panel/krview.h
+++ b/krusader/Panel/krview.h
@@ -41,7 +41,6 @@
 #include <QPixmap>
 #include <QDropEvent>
 
-#include "../krglobal.h"
 #include "../VFS/krquery.h"
 #include "../Filter/filtersettings.h"
 
@@ -51,7 +50,6 @@
 class KrViewItem;
 class KrQuickSearch;
 class KrPreviews;
-class QModelIndex;
 class KrViewInstance;
 class QuickFilter;
 class VfileContainer;
diff --git a/krusader/Panel/krview.cpp b/krusader/Panel/krview.cpp
--- a/krusader/Panel/krview.cpp
+++ b/krusader/Panel/krview.cpp
@@ -38,6 +38,7 @@
 #include "krpreviews.h"
 #include "quickfilter.h"
 #include "../kicons.h"
+#include "../krglobal.h"
 #include "../defaults.h"
 #include "../VFS/krpermhandler.h"
 #include "../VFS/vfilecontainer.h"
diff --git a/krusader/Panel/krviewitem.h b/krusader/Panel/krviewitem.h
--- a/krusader/Panel/krviewitem.h
+++ b/krusader/Panel/krviewitem.h
@@ -23,12 +23,13 @@
 #include "../VFS/vfile.h"
 #include "krview.h"
 
+// QtCore
+#include <QString>
 // QtGui
 #include <QPixmap>
 
 #include <KIO/Global>
 
-class QString;
 class QPixmap;
 
 class KrViewItem
diff --git a/krusader/Panel/krviewitem.cpp b/krusader/Panel/krviewitem.cpp
--- a/krusader/Panel/krviewitem.cpp
+++ b/krusader/Panel/krviewitem.cpp
@@ -21,6 +21,7 @@
 #include "../VFS/krpermhandler.h"
 
 // QtCore
+#include <QLocale>
 #include <QMimeDatabase>
 #include <QMimeType>
 // QtGui
diff --git a/krusader/Panel/listpanel.h b/krusader/Panel/listpanel.h
--- a/krusader/Panel/listpanel.h
+++ b/krusader/Panel/listpanel.h
@@ -61,13 +61,12 @@
 #include <KIOFileWidgets/KUrlNavigator>
 
 #include "krpanel.h"
-#include "krview.h"
+#include "krviewitem.h"
 #include "../Dialogs/krsqueezedtextlabel.h"
 
 #define PROP_SYNC_BUTTON_ON               1
 #define PROP_LOCKED                       2
 
-class vfs;
 class KrView;
 class KrQuickSearch;
 class QuickFilter;
diff --git a/krusader/Panel/listpanelactions.h b/krusader/Panel/listpanelactions.h
--- a/krusader/Panel/listpanelactions.h
+++ b/krusader/Panel/listpanelactions.h
@@ -40,7 +40,6 @@
 
 class FileManagerWindow;
 class KrPanel;
-class ListPanel;
 class ListPanelFunc;
 
 class ListPanelActions : public ActionsBase
diff --git a/krusader/Panel/listpanelframe.h b/krusader/Panel/listpanelframe.h
--- a/krusader/Panel/listpanelframe.h
+++ b/krusader/Panel/listpanelframe.h
@@ -19,13 +19,14 @@
 #ifndef LISTPANELFRAME_H
 #define LISTPANELFRAME_H
 
+// QtGui
+#include <QDropEvent>
 // QtWidgets
 #include <QFrame>
 
 # include <KConfigCore/KConfigGroup>
 
 class QDragEnterEvent;
-class QDropEvent;
 
 class ListPanelFrame : public QFrame
 {
diff --git a/krusader/Panel/panelfunc.h b/krusader/Panel/panelfunc.h
--- a/krusader/Panel/panelfunc.h
+++ b/krusader/Panel/panelfunc.h
@@ -45,6 +45,7 @@
 #include <KService/KService>
 
 class DirHistoryQueue;
+class ListPanel;
 
 class ListPanelFunc : public QObject
 {
diff --git a/krusader/Panel/panelfunc.cpp b/krusader/Panel/panelfunc.cpp
--- a/krusader/Panel/panelfunc.cpp
+++ b/krusader/Panel/panelfunc.cpp
@@ -76,7 +76,6 @@
 #include "../abstractpanelmanager.h"
 #include "../krservices.h"
 #include "../VFS/vfile.h"
-#include "../VFS/vfs.h"
 #include "../VFS/virt_vfs.h"
 #include "../VFS/krarchandler.h"
 #include "../VFS/krpermhandler.h"
diff --git a/krusader/Panel/panelpopup.h b/krusader/Panel/panelpopup.h
--- a/krusader/Panel/panelpopup.h
+++ b/krusader/Panel/panelpopup.h
@@ -37,7 +37,6 @@
 #include <KIOFileWidgets/KImageFilePreview>
 
 class QButtonGroup;
-class QLabel;
 class QSplitter;
 class QToolButton;
 class KrSqueezedTextLabel;
@@ -48,7 +47,6 @@
 class KrFileTreeView;
 class KDirModel;
 class KDirSortFilterProxyModel;
-class QPoint;
 class vfile;
 class FileManagerWindow;
 
diff --git a/krusader/Queue/queue_mgr.cpp b/krusader/Queue/queue_mgr.cpp
--- a/krusader/Queue/queue_mgr.cpp
+++ b/krusader/Queue/queue_mgr.cpp
@@ -18,7 +18,6 @@
 
 #include "queue_mgr.h"
 #include "queuedialog.h"
-#include "queue.h"
 
 // QtCore
 #include <QList>
diff --git a/krusader/Search/krsearchdialog.cpp b/krusader/Search/krsearchdialog.cpp
--- a/krusader/Search/krsearchdialog.cpp
+++ b/krusader/Search/krsearchdialog.cpp
@@ -52,7 +52,6 @@
 #include <KI18n/KLocalizedString>
 #include <KWidgetsAddons/KMessageBox>
 
-#include "krsearchmod.h"
 #include "../krglobal.h"
 #include "../kractions.h"
 #include "../krservices.h"
diff --git a/krusader/Synchronizer/synchronizedialog.h b/krusader/Synchronizer/synchronizedialog.h
--- a/krusader/Synchronizer/synchronizedialog.h
+++ b/krusader/Synchronizer/synchronizedialog.h
@@ -38,7 +38,6 @@
 #include <QProgressBar>
 #include <QPushButton>
 
-#include "../VFS/vfs.h"
 #include "synchronizer.h"
 
 class SynchronizeDialog : QDialog
diff --git a/krusader/UserAction/expander.cpp b/krusader/UserAction/expander.cpp
--- a/krusader/UserAction/expander.cpp
+++ b/krusader/UserAction/expander.cpp
@@ -60,8 +60,6 @@
 
 #define NEED_PANEL if (panel==0) { panelMissingError(_expression,exp); return QString(); }
 
-#include "tstring.h"
-
 
 inline void exp_placeholder::setError(Expander& exp, const Error& e)
 {
diff --git a/krusader/UserAction/kraction.h b/krusader/UserAction/kraction.h
--- a/krusader/UserAction/kraction.h
+++ b/krusader/UserAction/kraction.h
@@ -24,6 +24,8 @@
 // QtCore
 #include <QByteArray>
 #include <QUrl>
+// QtGui
+#include <QFont>
 // QtWidgets
 #include <QAction>
 #include <QDialog>
@@ -33,7 +35,6 @@
 
 #include "kractionbase.h"
 
-class UserActionProperties;
 class QDomDocument;
 class QDomElement;
 class KActionCollection;
@@ -180,7 +181,6 @@
     KActionCollection *_actionCollection;
 };
 
-class QFont;
 /**
  * This displays the output of a process
  */
diff --git a/krusader/UserAction/kractionbase.cpp b/krusader/UserAction/kractionbase.cpp
--- a/krusader/UserAction/kractionbase.cpp
+++ b/krusader/UserAction/kractionbase.cpp
@@ -27,7 +27,6 @@
 
 #include "kraction.h"
 #include "../krglobal.h"
-#include "expander.h"
 
 KrActionBase::~KrActionBase()
 {
diff --git a/krusader/UserAction/useraction.h b/krusader/UserAction/useraction.h
--- a/krusader/UserAction/useraction.h
+++ b/krusader/UserAction/useraction.h
@@ -26,7 +26,6 @@
 
 class QDomDocument;
 class QDomElement;
-class QString;
 class QStringList;
 class KrAction;
 class QUrl;
diff --git a/krusader/UserMenu/usermenu.h b/krusader/UserMenu/usermenu.h
--- a/krusader/UserMenu/usermenu.h
+++ b/krusader/UserMenu/usermenu.h
@@ -22,8 +22,8 @@
 
 // QtWidgets
 #include <QMenu>
+#include <QWidget>
 
-class QWidget;
 class UserMenu;
 class QAction;
 
diff --git a/krusader/VFS/kr7zencryptionchecker.h b/krusader/VFS/kr7zencryptionchecker.h
--- a/krusader/VFS/kr7zencryptionchecker.h
+++ b/krusader/VFS/kr7zencryptionchecker.h
@@ -23,8 +23,6 @@
 
 #include <KCoreAddons/KProcess>
 
-#include "../krservices.h"
-
 class Kr7zEncryptionChecker : public KProcess
 {
     Q_OBJECT
diff --git a/krusader/VFS/krarchandler.h b/krusader/VFS/krarchandler.h
--- a/krusader/VFS/krarchandler.h
+++ b/krusader/VFS/krarchandler.h
@@ -38,8 +38,6 @@
 #include <KCoreAddons/KProcess>
 
 #include "../../krArc/krarcbasemanager.h"
-#include "../../krArc/krlinecountingprocess.h"
-#include "kr7zencryptionchecker.h"
 
 namespace KWallet {
 class Wallet;
diff --git a/krusader/VFS/krarchandler.cpp b/krusader/VFS/krarchandler.cpp
--- a/krusader/VFS/krarchandler.cpp
+++ b/krusader/VFS/krarchandler.cpp
@@ -45,10 +45,12 @@
 #include <KWidgetsAddons/KMessageBox>
 #include <KWidgetsAddons/KPasswordDialog>
 
+#include "kr7zencryptionchecker.h"
 #include "../krglobal.h"
 #include "../defaults.h"
 #include "../krservices.h"
 #include "../Dialogs/krpleasewait.h"
+#include "../../krArc/krlinecountingprocess.h"
 
 #if 0
 class DefaultKRarcObserver : public KRarcObserver
diff --git a/krusader/filemanagerwindow.h b/krusader/filemanagerwindow.h
--- a/krusader/filemanagerwindow.h
+++ b/krusader/filemanagerwindow.h
@@ -19,6 +19,8 @@
 #ifndef FILEMANAGERWINDOW_H
 #define FILEMANAGERWINDOW_H
 
+#include <QAction>
+
 #include "krmainwindow.h"
 #include "abstractpanelmanager.h"
 
diff --git a/krusader/krglobal.h b/krusader/krglobal.h
--- a/krusader/krglobal.h
+++ b/krusader/krglobal.h
@@ -49,9 +49,7 @@
 class KrusaderView;
 class UserAction;
 class QWidget;
-class ListPanel;
 class KrPanel;
-class QAction;
 
 // global references to frequently used objects
 
diff --git a/krusader/krmainwindow.h b/krusader/krmainwindow.h
--- a/krusader/krmainwindow.h
+++ b/krusader/krmainwindow.h
@@ -21,7 +21,6 @@
 
 class QWidget;
 class KrView;
-class QAction;
 class KActionCollection;
 class ViewActions;
 
diff --git a/krusader/krservices.cpp b/krusader/krservices.cpp
--- a/krusader/krservices.cpp
+++ b/krusader/krservices.cpp
@@ -45,14 +45,6 @@
     return !QStandardPaths::findExecutable(cmdName).isEmpty();
 }
 
-static const QStringList bin_suffixes = QStringList()
-#ifdef Q_WS_WIN
-                                        << ".cmd" << ".exe" << ".bat"
-#else
-                                        << ""
-#endif
-                                        ;
-
 QString KrServices::fullPathName(QString name, QString confName)
 {
     QString supposedName;
diff --git a/krusader/krslots.h b/krusader/krslots.h
--- a/krusader/krslots.h
+++ b/krusader/krslots.h
@@ -40,8 +40,6 @@
 
 #include <KCoreAddons/KProcess>
 
-#include "krglobal.h"
-
 class KrMainWindow;
 class QUrl;
 
diff --git a/krusader/krtrashhandler.cpp b/krusader/krtrashhandler.cpp
--- a/krusader/krtrashhandler.cpp
+++ b/krusader/krtrashhandler.cpp
@@ -44,6 +44,7 @@
 #include <KCoreAddons/KDirWatch>
 
 #include "kractions.h"
+#include "../krglobal.h"
 #include "Panel/krpanel.h"
 #include "Panel/panelfunc.h"
 
diff --git a/krusader/krusader.h b/krusader/krusader.h
--- a/krusader/krusader.h
+++ b/krusader/krusader.h
@@ -67,7 +67,6 @@
 class KrusaderStatus;
 class KRPleaseWaitHandler;
 class UserMenu;
-class UserAction;
 class PopularUrls;
 class QueueManager;
 class ViewActions;
diff --git a/krusader/krusader.cpp b/krusader/krusader.cpp
--- a/krusader/krusader.cpp
+++ b/krusader/krusader.cpp
@@ -76,6 +76,7 @@
 #include "Panel/krcolorcache.h"
 #include "Panel/viewactions.h"
 #include "Panel/listpanelactions.h"
+#include "Panel/krpanel.h"
 #include "Panel/krview.h"
 #include "Panel/krviewfactory.h"
 #include "UserAction/kraction.h"
@@ -99,7 +100,6 @@
 #include "KViewer/krviewer.h"
 
 
-
 #ifdef __KJSEMBED__
 #include "KrJS/krjs.h"
 #endif
diff --git a/krusader/krusaderview.h b/krusader/krusaderview.h
--- a/krusader/krusaderview.h
+++ b/krusader/krusaderview.h
@@ -43,9 +43,6 @@
 
 #include "krglobal.h"
 
-//HACK
-#include "Panel/krpanel.h"
-
 class PanelManager;
 class ListPanel;
 
diff --git a/krusader/panelmanager.h b/krusader/panelmanager.h
--- a/krusader/panelmanager.h
+++ b/krusader/panelmanager.h
@@ -32,7 +32,6 @@
 
 #include "paneltabbar.h"
 
-class KConfig;
 class QStackedWidget;
 class QToolButton;
 class ListPanel;
diff --git a/krusader/paneltabbar.cpp b/krusader/paneltabbar.cpp
--- a/krusader/paneltabbar.cpp
+++ b/krusader/paneltabbar.cpp
@@ -22,6 +22,7 @@
 
 #include "defaults.h"
 #include "tabactions.h"
+#include "../krglobal.h"
 #include "Panel/listpanel.h"
 
 // QtCore