diff --git a/commands/imagelib/effects/kpEffectCommandBase.h b/commands/imagelib/effects/kpEffectCommandBase.h
--- a/commands/imagelib/effects/kpEffectCommandBase.h
+++ b/commands/imagelib/effects/kpEffectCommandBase.h
@@ -30,7 +30,7 @@
 #define kpEffectCommandBase_H
 
 
-#include <qwidget.h>
+#include <QWidget>
 
 #include "commands/kpCommand.h"
 #include "imagelib/kpImage.h"
diff --git a/commands/imagelib/effects/kpEffectFlattenCommand.h b/commands/imagelib/effects/kpEffectFlattenCommand.h
--- a/commands/imagelib/effects/kpEffectFlattenCommand.h
+++ b/commands/imagelib/effects/kpEffectFlattenCommand.h
@@ -30,7 +30,7 @@
 #define kpEffectFlattenCommand_H
 
 
-#include <qcolor.h>
+#include <QColor>
 
 #include "kpEffectCommandBase.h"
 #include "imagelib/kpImage.h"
diff --git a/commands/imagelib/transforms/kpTransformResizeScaleCommand.h b/commands/imagelib/transforms/kpTransformResizeScaleCommand.h
--- a/commands/imagelib/transforms/kpTransformResizeScaleCommand.h
+++ b/commands/imagelib/transforms/kpTransformResizeScaleCommand.h
@@ -30,7 +30,7 @@
 #define kpTransformResizeScaleCommand_H
 
 
-#include <qpixmap.h>
+#include <QPixmap>
 
 #include "imagelib/kpColor.h"
 #include "commands/kpCommand.h"
diff --git a/commands/kpCommandHistoryBase.h b/commands/kpCommandHistoryBase.h
--- a/commands/kpCommandHistoryBase.h
+++ b/commands/kpCommandHistoryBase.h
@@ -30,9 +30,10 @@
 #define kpCommandHistoryBase_H
 
 
-#include <qobject.h>
-#include <qstring.h>
-#include <qlinkedlist.h>
+#include <QObject>
+#include <QString>
+#include <QLinkedList>
+
 
 #include "commands/kpCommandSize.h"
 
diff --git a/dialogs/imagelib/transforms/kpTransformPreviewDialog.h b/dialogs/imagelib/transforms/kpTransformPreviewDialog.h
--- a/dialogs/imagelib/transforms/kpTransformPreviewDialog.h
+++ b/dialogs/imagelib/transforms/kpTransformPreviewDialog.h
@@ -31,7 +31,7 @@
 
 
 #include <QDialog>
-#include <qpixmap.h>
+#include <QPixmap>
 
 
 class QLabel;
diff --git a/dialogs/imagelib/transforms/kpTransformRotateDialog.h b/dialogs/imagelib/transforms/kpTransformRotateDialog.h
--- a/dialogs/imagelib/transforms/kpTransformRotateDialog.h
+++ b/dialogs/imagelib/transforms/kpTransformRotateDialog.h
@@ -31,7 +31,7 @@
 
 
 #include <QImage>
-#include <qpoint.h>
+#include <QPoint>
 
 #include "imagelib/kpColor.h"
 #include "dialogs/imagelib/transforms/kpTransformPreviewDialog.h"
diff --git a/dialogs/kpDocumentSaveOptionsPreviewDialog.h b/dialogs/kpDocumentSaveOptionsPreviewDialog.h
--- a/dialogs/kpDocumentSaveOptionsPreviewDialog.h
+++ b/dialogs/kpDocumentSaveOptionsPreviewDialog.h
@@ -31,7 +31,7 @@
 
 #include "generic/widgets/kpSubWindow.h"
 
-#include <qsize.h>
+#include <QSize>
 
 
 class QCloseEvent;
diff --git a/document/kpDocument.h b/document/kpDocument.h
--- a/document/kpDocument.h
+++ b/document/kpDocument.h
@@ -30,10 +30,10 @@
 #define KP_DOCUMENT_H
 
 
-#include <qbitmap.h>
-#include <qobject.h>
-#include <qstring.h>
-#include <qurl.h>
+#include <QBitmap>
+#include <QObject>
+#include <QString>
+#include <QUrl>
 
 #include "imagelib/kpImage.h"
 #include "pixmapfx/kpPixmapFX.h"
diff --git a/generic/widgets/kpResizeSignallingLabel.h b/generic/widgets/kpResizeSignallingLabel.h
--- a/generic/widgets/kpResizeSignallingLabel.h
+++ b/generic/widgets/kpResizeSignallingLabel.h
@@ -30,7 +30,7 @@
 #define KP_RESIZE_SIGNALLING_LABEL_H
 
 
-#include <qlabel.h>
+#include <QLabel>
 
 
 class QResizeEvent;
diff --git a/imagelib/kpColor.h b/imagelib/kpColor.h
--- a/imagelib/kpColor.h
+++ b/imagelib/kpColor.h
@@ -30,7 +30,7 @@
 #define KP_COLOR_H
 
 
-#include <qcolor.h>
+#include <QColor>
 
 
 class QDataStream;
diff --git a/imagelib/kpDocumentMetaInfo.h b/imagelib/kpDocumentMetaInfo.h
--- a/imagelib/kpDocumentMetaInfo.h
+++ b/imagelib/kpDocumentMetaInfo.h
@@ -30,10 +30,10 @@
 #define KP_DOCUMENT_META_INFO_H
 
 
-#include <qimage.h>
-#include <qlist.h>
-#include <qmap.h>
-#include <qstring.h>
+#include <QImage>
+#include <QList>
+#include <QMap>
+#include <QString>
 
 #include "commands/kpCommandSize.h"
 
diff --git a/kpDefs.h b/kpDefs.h
--- a/kpDefs.h
+++ b/kpDefs.h
@@ -32,10 +32,10 @@
 
 #include <limits.h>
 
-#include <qglobal.h>
-#include <qpoint.h>
-#include <qsize.h>
-#include <qstring.h>
+#include <QtGlobal>
+#include <QPoint>
+#include <QSize>
+#include <QString>
 
 
 // approx. 2896x2896x32bpp or 3344x3344x24bpp (TODO: 24==32?) or 4096*4096x16bpp
diff --git a/kpViewScrollableContainer.h b/kpViewScrollableContainer.h
--- a/kpViewScrollableContainer.h
+++ b/kpViewScrollableContainer.h
@@ -30,10 +30,10 @@
 #define KP_VIEW_SCROLLABLE_CONTAINER_H
 
 
-#include <qlabel.h>
-#include <qpoint.h>
+#include <QLabel>
+#include <QPoint>
 #include <QScrollArea>
-#include <qsize.h>
+#include <QSize>
 
 
 class QCursor;
diff --git a/layers/selections/text/kpTextStyle.h b/layers/selections/text/kpTextStyle.h
--- a/layers/selections/text/kpTextStyle.h
+++ b/layers/selections/text/kpTextStyle.h
@@ -30,7 +30,7 @@
 #define KP_TEXT_STYLE_H
 
 
-#include <qstring.h>
+#include <QString>
 
 #include "imagelib/kpColor.h"
 
diff --git a/layers/tempImage/kpTempImage.h b/layers/tempImage/kpTempImage.h
--- a/layers/tempImage/kpTempImage.h
+++ b/layers/tempImage/kpTempImage.h
@@ -32,7 +32,7 @@
 #define kpTempImage_H
 
 
-#include <qpoint.h>
+#include <QPoint>
 
 #include "imagelib/kpImage.h"
 
diff --git a/pixmapfx/kpPixmapFX.h b/pixmapfx/kpPixmapFX.h
--- a/pixmapfx/kpPixmapFX.h
+++ b/pixmapfx/kpPixmapFX.h
@@ -33,8 +33,8 @@
 #define KP_PIXMAP_FX_H
 
 
-#include <qrect.h>
-#include <qstring.h>
+#include <QRect>
+#include <QString>
 
 #include <klocalizedstring.h>
 
diff --git a/tools/flow/kpToolFlowBase.h b/tools/flow/kpToolFlowBase.h
--- a/tools/flow/kpToolFlowBase.h
+++ b/tools/flow/kpToolFlowBase.h
@@ -30,7 +30,7 @@
 #define KP_TOOL_FLOW_BASE_H
 
 
-#include <qrect.h>
+#include <QRect>
 
 #include "layers/tempImage/kpTempImage.h"
 #include "tools/kpTool.h"
diff --git a/tools/kpTool.h b/tools/kpTool.h
--- a/tools/kpTool.h
+++ b/tools/kpTool.h
@@ -30,11 +30,11 @@
 #define KP_TOOL_H
 
 
-#include <qobject.h>
-#include <qpoint.h>
-#include <qrect.h>
-#include <qsize.h>
-#include <qstring.h>
+#include <QObject>
+#include <QPoint>
+#include <QRect>
+#include <QSize>
+#include <QString>
 
 #include "kpDefs.h"
 #ifdef Q_OS_WIN
diff --git a/tools/polygonal/kpToolPolygonalBase.h b/tools/polygonal/kpToolPolygonalBase.h
--- a/tools/polygonal/kpToolPolygonalBase.h
+++ b/tools/polygonal/kpToolPolygonalBase.h
@@ -30,8 +30,8 @@
 #define kpToolPolygonalBase_H
 
 
-#include <qpoint.h>
-#include <qrect.h>
+#include <QPoint>
+#include <QRect>
 
 #include "imagelib/kpColor.h"
 #include "imagelib/kpImage.h"
diff --git a/views/kpView.h b/views/kpView.h
--- a/views/kpView.h
+++ b/views/kpView.h
@@ -30,7 +30,7 @@
 #define KP_VIEW_H
 
 
-#include <qwidget.h>
+#include <QWidget>
 
 #include "kpDefs.h"
 
diff --git a/widgets/imagelib/effects/kpEffectFlattenWidget.h b/widgets/imagelib/effects/kpEffectFlattenWidget.h
--- a/widgets/imagelib/effects/kpEffectFlattenWidget.h
+++ b/widgets/imagelib/effects/kpEffectFlattenWidget.h
@@ -30,7 +30,7 @@
 #define kpEffectFlattenWidget_H
 
 
-#include <qcolor.h>
+#include <QColor>
 
 #include "kpEffectWidgetBase.h"
 
diff --git a/widgets/imagelib/effects/kpEffectWidgetBase.h b/widgets/imagelib/effects/kpEffectWidgetBase.h
--- a/widgets/imagelib/effects/kpEffectWidgetBase.h
+++ b/widgets/imagelib/effects/kpEffectWidgetBase.h
@@ -30,7 +30,7 @@
 #define kpEffectWidgetBase_H
 
 
-#include <qwidget.h>
+#include <QWidget>
 
 #include "imagelib/kpImage.h"
 
diff --git a/widgets/kpDocumentSaveOptionsWidget.h b/widgets/kpDocumentSaveOptionsWidget.h
--- a/widgets/kpDocumentSaveOptionsWidget.h
+++ b/widgets/kpDocumentSaveOptionsWidget.h
@@ -30,9 +30,9 @@
 #define kpDocumentSaveOptionsWidget_H
 
 
-#include <qrect.h>
-#include <qsize.h>
-#include <qwidget.h>
+#include <QRect>
+#include <QSize>
+#include <QWidget>
 
 #include "imagelib/kpDocumentMetaInfo.h"
 #include "document/kpDocumentSaveOptions.h"
diff --git a/widgets/kpDualColorButton.h b/widgets/kpDualColorButton.h
--- a/widgets/kpDualColorButton.h
+++ b/widgets/kpDualColorButton.h
@@ -30,7 +30,7 @@
 #define kpDualColorButton_H
 
 
-#include <qframe.h>
+#include <QFrame>
 
 #include "imagelib/kpColor.h"
 
diff --git a/widgets/kpTransparentColorCell.h b/widgets/kpTransparentColorCell.h
--- a/widgets/kpTransparentColorCell.h
+++ b/widgets/kpTransparentColorCell.h
@@ -30,7 +30,7 @@
 #define kpTransparentColorCell_H
 
 
-#include <qframe.h>
+#include <QFrame>
 
 
 class kpColor;
diff --git a/widgets/toolbars/kpColorToolBar.h b/widgets/toolbars/kpColorToolBar.h
--- a/widgets/toolbars/kpColorToolBar.h
+++ b/widgets/toolbars/kpColorToolBar.h
@@ -31,8 +31,8 @@
 
 
 #include <QDockWidget>
-#include <qframe.h>
-#include <qwidget.h>
+#include <QFrame>
+#include <QWidget>
 
 #include "imagelib/kpColor.h"
 
diff --git a/widgets/toolbars/kpToolToolBar.h b/widgets/toolbars/kpToolToolBar.h
--- a/widgets/toolbars/kpToolToolBar.h
+++ b/widgets/toolbars/kpToolToolBar.h
@@ -31,7 +31,7 @@
 #define KP_TOOL_TOOL_BAR_H
 
 
-#include <qlist.h>
+#include <QList>
 
 #include <KToolBar>
 
diff --git a/widgets/toolbars/options/kpToolWidgetBase.h b/widgets/toolbars/options/kpToolWidgetBase.h
--- a/widgets/toolbars/options/kpToolWidgetBase.h
+++ b/widgets/toolbars/options/kpToolWidgetBase.h
@@ -30,12 +30,12 @@
 #define KP_TOOL_WIDGET_BASE_H
 
 
-#include <qframe.h>
-#include <qpair.h>
-#include <qpixmap.h>
-#include <qrect.h>
-#include <qlist.h>
-#include <qwidget.h>
+#include <QFrame>
+#include <QPair>
+#include <QPixmap>
+#include <QRect>
+#include <QList>
+#include <QWidget>
 
 
 class QMouseEvent;
diff --git a/widgets/toolbars/options/kpToolWidgetBrush.h b/widgets/toolbars/options/kpToolWidgetBrush.h
--- a/widgets/toolbars/options/kpToolWidgetBrush.h
+++ b/widgets/toolbars/options/kpToolWidgetBrush.h
@@ -33,7 +33,7 @@
 #include "imagelib/kpColor.h"
 #include "layers/tempImage/kpTempImage.h"
 
-#include <qpixmap.h>
+#include <QPixmap>
 
 
 class kpToolWidgetBrush : public kpToolWidgetBase
diff --git a/widgets/toolbars/options/kpToolWidgetEraserSize.h b/widgets/toolbars/options/kpToolWidgetEraserSize.h
--- a/widgets/toolbars/options/kpToolWidgetEraserSize.h
+++ b/widgets/toolbars/options/kpToolWidgetEraserSize.h
@@ -33,7 +33,7 @@
 #include "imagelib/kpColor.h"
 #include "layers/tempImage/kpTempImage.h"
 
-#include <qpixmap.h>
+#include <QPixmap>
 
 
 class kpColor;