diff --git a/commands/imagelib/transforms/kpTransformFlipCommand.cpp b/commands/imagelib/transforms/kpTransformFlipCommand.cpp
--- a/commands/imagelib/transforms/kpTransformFlipCommand.cpp
+++ b/commands/imagelib/transforms/kpTransformFlipCommand.cpp
@@ -28,7 +28,7 @@
 
 #include "kpTransformFlipCommand.h"
 
-#include <qapplication.h>
+#include <QApplication>
 
 #include "kpLogCategories.h"
 #include "layers/selections/image/kpAbstractImageSelection.h"
diff --git a/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp b/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp
--- a/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp
+++ b/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp
@@ -41,14 +41,14 @@
 #include "layers/selections/image/kpRectangularImageSelection.h"
 #include "layers/selections/text/kpTextSelection.h"
 
-#include <math.h>
-
-#include <qapplication.h>
-#include <qpoint.h>
-#include <qpolygon.h>
-#include <qrect.h>
-#include <qsize.h>
-#include <qmatrix.h>
+#include <cmath>
+
+#include <QApplication>
+#include <QPoint>
+#include <QPolygon>
+#include <QRect>
+#include <QSize>
+#include <QMatrix>
 
 #include "kpLogCategories.h"
 
diff --git a/commands/imagelib/transforms/kpTransformRotateCommand.cpp b/commands/imagelib/transforms/kpTransformRotateCommand.cpp
--- a/commands/imagelib/transforms/kpTransformRotateCommand.cpp
+++ b/commands/imagelib/transforms/kpTransformRotateCommand.cpp
@@ -40,9 +40,9 @@
 #include "views/manager/kpViewManager.h"
 #include "kpLogCategories.h"
 
-#include <qapplication.h>
-#include <qpolygon.h>
-#include <qmatrix.h>
+#include <QApplication>
+#include <QPolygon>
+#include <QMatrix>
 
 #include <KLocalizedString>
 
diff --git a/commands/imagelib/transforms/kpTransformSkewCommand.cpp b/commands/imagelib/transforms/kpTransformSkewCommand.cpp
--- a/commands/imagelib/transforms/kpTransformSkewCommand.cpp
+++ b/commands/imagelib/transforms/kpTransformSkewCommand.cpp
@@ -41,9 +41,9 @@
 #include "layers/selections/image/kpRectangularImageSelection.h"
 #include "kpLogCategories.h"
 
-#include <qapplication.h>
-#include <qmatrix.h>
-#include <qpolygon.h>
+#include <QApplication>
+#include <QMatrix>
+#include <QPolygon>
 
 // TODO: nasty, should avoid using GUI class in this command class
 #include "dialogs/imagelib/transforms/kpTransformSkewDialog.h"
diff --git a/commands/kpCommandHistoryBase.cpp b/commands/kpCommandHistoryBase.cpp
--- a/commands/kpCommandHistoryBase.cpp
+++ b/commands/kpCommandHistoryBase.cpp
@@ -33,8 +33,8 @@
 
 #include <climits>
 
-#include <qlinkedlist.h>
-#include <qmenu.h>
+#include <QLinkedList>
+#include <QMenu>
 
 #include <KSharedConfig>
 #include <kconfiggroup.h>
diff --git a/commands/tools/flow/kpToolFlowCommand.cpp b/commands/tools/flow/kpToolFlowCommand.cpp
--- a/commands/tools/flow/kpToolFlowCommand.cpp
+++ b/commands/tools/flow/kpToolFlowCommand.cpp
@@ -37,7 +37,7 @@
 #include "tools/kpTool.h"
 #include "views/manager/kpViewManager.h"
 
-#include <qrect.h>
+#include <QRect>
 
 
 struct kpToolFlowCommandPrivate
diff --git a/commands/tools/kpToolFloodFillCommand.cpp b/commands/tools/kpToolFloodFillCommand.cpp
--- a/commands/tools/kpToolFloodFillCommand.cpp
+++ b/commands/tools/kpToolFloodFillCommand.cpp
@@ -37,7 +37,7 @@
 #include "imagelib/kpImage.h"
 #include "kpLogCategories.h"
 
-#include <qapplication.h>
+#include <QApplication>
 
 #include <KLocalizedString>
 
diff --git a/commands/tools/selection/kpToolSelectionCreateCommand.cpp b/commands/tools/selection/kpToolSelectionCreateCommand.cpp
--- a/commands/tools/selection/kpToolSelectionCreateCommand.cpp
+++ b/commands/tools/selection/kpToolSelectionCreateCommand.cpp
@@ -44,15 +44,15 @@
 
 #include "kpLogCategories.h"
 
-#include <qapplication.h>
-#include <qbitmap.h>
-#include <qcursor.h>
-#include <qevent.h>
-#include <qmenu.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qpolygon.h>
-#include <qtimer.h>
+#include <QApplication>
+#include <QBitmap>
+#include <QCursor>
+#include <QEvent>
+#include <QMenu>
+#include <QPainter>
+#include <QPixmap>
+#include <QPolygon>
+#include <QTimer>
 
 
 kpToolSelectionCreateCommand::kpToolSelectionCreateCommand (const QString &name,
diff --git a/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp b/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp
--- a/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp
+++ b/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp
@@ -40,9 +40,9 @@
 #include "layers/selections/text/kpTextSelection.h"
 #include "kpLogCategories.h"
 
-#include <qapplication.h>
-#include <qcursor.h>
-#include <qtimer.h>
+#include <QApplication>
+#include <QCursor>
+#include <QTimer>
 
 #include <KLocalizedString>
 
diff --git a/commands/tools/selection/text/kpToolTextBackspaceCommand.cpp b/commands/tools/selection/text/kpToolTextBackspaceCommand.cpp
--- a/commands/tools/selection/text/kpToolTextBackspaceCommand.cpp
+++ b/commands/tools/selection/text/kpToolTextBackspaceCommand.cpp
@@ -33,7 +33,7 @@
 #include "layers/selections/text/kpTextSelection.h"
 #include "views/manager/kpViewManager.h"
 
-#include <qlist.h>
+#include <QList>
 
 
 kpToolTextBackspaceCommand::kpToolTextBackspaceCommand (const QString &name,
diff --git a/commands/tools/selection/text/kpToolTextDeleteCommand.cpp b/commands/tools/selection/text/kpToolTextDeleteCommand.cpp
--- a/commands/tools/selection/text/kpToolTextDeleteCommand.cpp
+++ b/commands/tools/selection/text/kpToolTextDeleteCommand.cpp
@@ -33,7 +33,7 @@
 #include "layers/selections/text/kpTextSelection.h"
 #include "views/manager/kpViewManager.h"
 
-#include <qlist.h>
+#include <QList>
 
 
 kpToolTextDeleteCommand::kpToolTextDeleteCommand (const QString &name,
diff --git a/commands/tools/selection/text/kpToolTextEnterCommand.cpp b/commands/tools/selection/text/kpToolTextEnterCommand.cpp
--- a/commands/tools/selection/text/kpToolTextEnterCommand.cpp
+++ b/commands/tools/selection/text/kpToolTextEnterCommand.cpp
@@ -33,7 +33,7 @@
 #include "layers/selections/text/kpTextSelection.h"
 #include "views/manager/kpViewManager.h"
 
-#include <qlist.h>
+#include <QList>
 
 
 kpToolTextEnterCommand::kpToolTextEnterCommand (const QString &name,
diff --git a/commands/tools/selection/text/kpToolTextInsertCommand.cpp b/commands/tools/selection/text/kpToolTextInsertCommand.cpp
--- a/commands/tools/selection/text/kpToolTextInsertCommand.cpp
+++ b/commands/tools/selection/text/kpToolTextInsertCommand.cpp
@@ -33,7 +33,7 @@
 #include "layers/selections/text/kpTextSelection.h"
 #include "views/manager/kpViewManager.h"
 
-#include <qlist.h>
+#include <QList>
 
 //---------------------------------------------------------------------
 
diff --git a/cursors/kpCursorLightCross.cpp b/cursors/kpCursorLightCross.cpp
--- a/cursors/kpCursorLightCross.cpp
+++ b/cursors/kpCursorLightCross.cpp
@@ -32,8 +32,8 @@
 
 #include "kpLogCategories.h"
 
-#include <qbitmap.h>
-#include <qcursor.h>
+#include <QBitmap>
+#include <QCursor>
 
 
 enum PixelValue
diff --git a/cursors/kpCursorProvider.cpp b/cursors/kpCursorProvider.cpp
--- a/cursors/kpCursorProvider.cpp
+++ b/cursors/kpCursorProvider.cpp
@@ -30,7 +30,7 @@
 
 #include "kpCursorLightCross.h"
 
-#include <qcursor.h>
+#include <QCursor>
 
 
 static const QCursor *TheLightCursor = nullptr;
diff --git a/dialogs/imagelib/effects/kpEffectsDialog.cpp b/dialogs/imagelib/effects/kpEffectsDialog.cpp
--- a/dialogs/imagelib/effects/kpEffectsDialog.cpp
+++ b/dialogs/imagelib/effects/kpEffectsDialog.cpp
@@ -48,11 +48,11 @@
 #include "kpLogCategories.h"
 #include <KLocalizedString>
 
-#include <qcombobox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qtimer.h>
+#include <QComboBox>
+#include <QGroupBox>
+#include <QLabel>
+#include <QLayout>
+#include <QTimer>
 #include <QImage>
 
 
diff --git a/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp b/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp
--- a/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp
+++ b/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp
@@ -31,15 +31,15 @@
 
 #include "dialogs/imagelib/transforms/kpTransformPreviewDialog.h"
 
-#include <qapplication.h>
-#include <qboxlayout.h>
-#include <qdialogbuttonbox.h>
-#include <qgridlayout.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpixmap.h>
-#include <qpushbutton.h>
+#include <QApplication>
+#include <QBoxLayout>
+#include <QDialogButtonBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QLabel>
+#include <QLayout>
+#include <QPixmap>
+#include <QPushButton>
 
 #include "kpLogCategories.h"
 #include <KLocalizedString>
diff --git a/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp b/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp
--- a/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp
+++ b/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp
@@ -31,20 +31,20 @@
 
 #include "kpTransformResizeScaleDialog.h"
 
-#include <math.h>
-
-#include <qboxlayout.h>
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qdialogbuttonbox.h>
-#include <qgridlayout.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpixmap.h>
-#include <qsize.h>
-#include <qtoolbutton.h>
+#include <cmath>
+
+#include <QBoxLayout>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QLabel>
+#include <QLayout>
+#include <QPixmap>
+#include <QSize>
+#include <QToolButton>
 #include <QSpinBox>
 #include <QDoubleSpinBox>
 
diff --git a/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp b/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp
--- a/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp
+++ b/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp
@@ -40,16 +40,16 @@
 #include <kiconloader.h>
 #include <KLocalizedString>
 
-#include <qbuttongroup.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <QButtonGroup>
+#include <QGroupBox>
+#include <QLabel>
+#include <QLayout>
 #include <QImage>
 #include <QSpinBox>
-#include <qpolygon.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qmatrix.h>
+#include <QPolygon>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QMatrix>
 
 
 // private static
diff --git a/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp b/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp
--- a/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp
+++ b/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp
@@ -31,13 +31,13 @@
 
 #include "dialogs/imagelib/transforms/kpTransformSkewDialog.h"
 
-#include <qapplication.h>
-#include <qgridlayout.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qmatrix.h>
+#include <QApplication>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QLabel>
+#include <QLayout>
+#include <QPushButton>
+#include <QMatrix>
 #include <QImage>
 #include <QSpinBox>
 
diff --git a/dialogs/kpColorSimilarityDialog.cpp b/dialogs/kpColorSimilarityDialog.cpp
--- a/dialogs/kpColorSimilarityDialog.cpp
+++ b/dialogs/kpColorSimilarityDialog.cpp
@@ -33,12 +33,12 @@
 #include <KLocalizedString>
 #include "../widgets/imagelib/effects/kpNumInput.h"
 
-#include <qboxlayout.h>
-#include <qdialogbuttonbox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <QBoxLayout>
+#include <QDialogButtonBox>
+#include <QGroupBox>
+#include <QLabel>
+#include <QLayout>
+#include <QPushButton>
 #include <QWhatsThis>
 
 kpColorSimilarityDialog::kpColorSimilarityDialog (QWidget *parent)
diff --git a/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp b/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp
--- a/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp
+++ b/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp
@@ -30,11 +30,11 @@
 
 #include "kpDocumentSaveOptionsPreviewDialog.h"
 
-#include <qevent.h>
-#include <qgridlayout.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpixmap.h>
+#include <QEvent>
+#include <QGridLayout>
+#include <QLabel>
+#include <QLayout>
+#include <QPixmap>
 
 #include <kconfig.h>
 #include "kpLogCategories.h"
diff --git a/document/kpDocument.cpp b/document/kpDocument.cpp
--- a/document/kpDocument.cpp
+++ b/document/kpDocument.cpp
@@ -46,23 +46,23 @@
 #include "widgets/toolbars/kpToolToolBar.h"
 #include "lgpl/generic/kpUrlFormatter.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "kpLogCategories.h"
 #include <kio/netaccess.h> // kdelibs4support
 #include <KLocalizedString>
 
-#include <qcolor.h>
-#include <qbitmap.h>
-#include <qbrush.h>
-#include <qfile.h>
-#include <qimage.h>
-#include <qlist.h>
+#include <QColor>
+#include <QBitmap>
+#include <QBrush>
+#include <QFile>
 #include <QImage>
-#include <qpainter.h>
-#include <qrect.h>
-#include <qsize.h>
-#include <qmatrix.h>
+#include <QList>
+#include <QImage>
+#include <QPainter>
+#include <QRect>
+#include <QSize>
+#include <QMatrix>
 
 //---------------------------------------------------------------------
 
diff --git a/document/kpDocumentSaveOptions.cpp b/document/kpDocumentSaveOptions.cpp
--- a/document/kpDocumentSaveOptions.cpp
+++ b/document/kpDocumentSaveOptions.cpp
@@ -37,9 +37,9 @@
 #include "kpLogCategories.h"
 #include <ksharedconfig.h>
 
-#include <qbitmap.h>
+#include <QBitmap>
 #include <QImage>
-#include <qstring.h>
+#include <QString>
 
 //---------------------------------------------------------------------
 
diff --git a/document/kpDocument_Open.cpp b/document/kpDocument_Open.cpp
--- a/document/kpDocument_Open.cpp
+++ b/document/kpDocument_Open.cpp
@@ -43,10 +43,10 @@
 #include "lgpl/generic/kpUrlFormatter.h"
 #include "views/manager/kpViewManager.h"
 
-#include <math.h>
+#include <cmath>
 
-#include <qcolor.h>
-#include <qimage.h>
+#include <QColor>
+#include <QImage>
 #include <QMimeDatabase>
 #include <QImageReader>
 
diff --git a/document/kpDocument_Save.cpp b/document/kpDocument_Save.cpp
--- a/document/kpDocument_Save.cpp
+++ b/document/kpDocument_Save.cpp
@@ -31,21 +31,21 @@
 #include "kpDocument.h"
 #include "kpDocumentPrivate.h"
 
-#include <math.h>
-
-#include <qcolor.h>
-#include <qbitmap.h>
-#include <qbrush.h>
-#include <qfile.h>
-#include <qimage.h>
-#include <qlist.h>
+#include <cmath>
+
+#include <QColor>
+#include <QBitmap>
+#include <QBrush>
+#include <QFile>
+#include <QImage>
+#include <QList>
 #include <QImage>
-#include <qpainter.h>
-#include <qrect.h>
-#include <qsavefile.h>
-#include <qsize.h>
-#include <qtemporaryfile.h>
-#include <qmatrix.h>
+#include <QPainter>
+#include <QRect>
+#include <QSaveFile>
+#include <QSize>
+#include <QTemporaryFile>
+#include <QMatrix>
 #include <QMimeDatabase>
 
 #include "kpLogCategories.h"
diff --git a/document/kpDocument_Selection.cpp b/document/kpDocument_Selection.cpp
--- a/document/kpDocument_Selection.cpp
+++ b/document/kpDocument_Selection.cpp
@@ -32,11 +32,11 @@
 #include "kpDocument.h"
 #include "kpDocumentPrivate.h"
 
-#include <math.h>
+#include <cmath>
 
-#include <qimage.h>
-#include <qpainter.h>
-#include <qrect.h>
+#include <QImage>
+#include <QPainter>
+#include <QRect>
 
 #include "kpLogCategories.h"
 #include <KLocalizedString>
diff --git a/generic/kpWidgetMapper.cpp b/generic/kpWidgetMapper.cpp
--- a/generic/kpWidgetMapper.cpp
+++ b/generic/kpWidgetMapper.cpp
@@ -28,9 +28,9 @@
 
 #include "kpWidgetMapper.h"
 
-#include <qpoint.h>
-#include <qrect.h>
-#include <qwidget.h>
+#include <QPoint>
+#include <QRect>
+#include <QWidget>
 
 
 namespace kpWidgetMapper
diff --git a/generic/widgets/kpResizeSignallingLabel.cpp b/generic/widgets/kpResizeSignallingLabel.cpp
--- a/generic/widgets/kpResizeSignallingLabel.cpp
+++ b/generic/widgets/kpResizeSignallingLabel.cpp
@@ -31,7 +31,7 @@
 
 #include "generic/widgets/kpResizeSignallingLabel.h"
 
-#include <qevent.h>
+#include <QEvent>
 
 #include "kpLogCategories.h"
 
diff --git a/imagelib/effects/kpEffectBalance.cpp b/imagelib/effects/kpEffectBalance.cpp
--- a/imagelib/effects/kpEffectBalance.cpp
+++ b/imagelib/effects/kpEffectBalance.cpp
@@ -31,9 +31,9 @@
 
 #include "kpEffectBalance.h"
 
-#include <math.h>
+#include <cmath>
 
-#include <qimage.h>
+#include <QImage>
 
 #include "kpLogCategories.h"
 
diff --git a/imagelib/effects/kpEffectHSV.cpp b/imagelib/effects/kpEffectHSV.cpp
--- a/imagelib/effects/kpEffectHSV.cpp
+++ b/imagelib/effects/kpEffectHSV.cpp
@@ -29,10 +29,10 @@
 
 #include "kpEffectHSV.h"
 
-#include <math.h>
+#include <cmath>
 
-#include <qbitmap.h>
-#include <qimage.h>
+#include <QBitmap>
+#include <QImage>
 
 #include "kpLogCategories.h"
 
diff --git a/imagelib/effects/kpEffectInvert.cpp b/imagelib/effects/kpEffectInvert.cpp
--- a/imagelib/effects/kpEffectInvert.cpp
+++ b/imagelib/effects/kpEffectInvert.cpp
@@ -31,7 +31,7 @@
 
 #include "kpEffectInvert.h"
 
-#include <qimage.h>
+#include <QImage>
 #include <QImage>
 
 #include "kpLogCategories.h"
diff --git a/imagelib/effects/kpEffectToneEnhance.cpp b/imagelib/effects/kpEffectToneEnhance.cpp
--- a/imagelib/effects/kpEffectToneEnhance.cpp
+++ b/imagelib/effects/kpEffectToneEnhance.cpp
@@ -31,7 +31,7 @@
 
 #include "kpEffectToneEnhance.h"
 
-#include <qimage.h>
+#include <QImage>
 
 #include "kpLogCategories.h"
 
diff --git a/imagelib/kpColor.cpp b/imagelib/kpColor.cpp
--- a/imagelib/kpColor.cpp
+++ b/imagelib/kpColor.cpp
@@ -31,7 +31,7 @@
 
 #include "kpColor.h"
 
-#include <qdatastream.h>
+#include <QDataStream>
 
 #include "kpLogCategories.h"
 
diff --git a/imagelib/kpDocumentMetaInfo.cpp b/imagelib/kpDocumentMetaInfo.cpp
--- a/imagelib/kpDocumentMetaInfo.cpp
+++ b/imagelib/kpDocumentMetaInfo.cpp
@@ -29,10 +29,9 @@
 #include "kpDocumentMetaInfo.h"
 
 #include <cmath>
-#include <math.h>
 
-#include <qlist.h>
-#include <qpoint.h>
+#include <QList>
+#include <QPoint>
 
 #include "kpLogCategories.h"
 
diff --git a/imagelib/transforms/kpTransformAutoCrop.cpp b/imagelib/transforms/kpTransformAutoCrop.cpp
--- a/imagelib/transforms/kpTransformAutoCrop.cpp
+++ b/imagelib/transforms/kpTransformAutoCrop.cpp
@@ -63,7 +63,7 @@
 #include <kmessagebox.h>
 #include <KLocalizedString>
 
-#include <qimage.h>
+#include <QImage>
 
 //---------------------------------------------------------------------
 
diff --git a/kpViewScrollableContainer.cpp b/kpViewScrollableContainer.cpp
--- a/kpViewScrollableContainer.cpp
+++ b/kpViewScrollableContainer.cpp
@@ -29,13 +29,13 @@
 
 #include "kpViewScrollableContainer.h"
 
-#include <qbitmap.h>
-#include <qcursor.h>
-#include <qevent.h>
-#include <qpainter.h>
-#include <qpen.h>
-#include <qpixmap.h>
-#include <qtimer.h>
+#include <QBitmap>
+#include <QCursor>
+#include <QKeyEvent>
+#include <QPainter>
+#include <QPen>
+#include <QPixmap>
+#include <QTimer>
 #include <QScrollBar>
 
 #include "kpLogCategories.h"
diff --git a/layers/selections/kpSelectionDrag.cpp b/layers/selections/kpSelectionDrag.cpp
--- a/layers/selections/kpSelectionDrag.cpp
+++ b/layers/selections/kpSelectionDrag.cpp
@@ -31,7 +31,7 @@
 
 #include "kpSelectionDrag.h"
 
-#include <qdatastream.h>
+#include <QDataStream>
 #include <QImage>
 #include <QUrl>
 
diff --git a/layers/selections/text/kpTextStyle.cpp b/layers/selections/text/kpTextStyle.cpp
--- a/layers/selections/text/kpTextStyle.cpp
+++ b/layers/selections/text/kpTextStyle.cpp
@@ -28,9 +28,9 @@
 
 #include "layers/selections/text/kpTextStyle.h"
 
-#include <qdatastream.h>
-#include <qfont.h>
-#include <qfontmetrics.h>
+#include <QDataStream>
+#include <QFont>
+#include <QFontMetrics>
 
 
 kpTextStyle::kpTextStyle ()
diff --git a/mainWindow/kpMainWindow.cpp b/mainWindow/kpMainWindow.cpp
--- a/mainWindow/kpMainWindow.cpp
+++ b/mainWindow/kpMainWindow.cpp
@@ -52,9 +52,9 @@
 #include <kconfiggroup.h>
 #include <KLocalizedString>
 
-#include <qevent.h>
-#include <qmenu.h>
-#include <qtimer.h>
+#include <QEvent>
+#include <QMenu>
+#include <QTimer>
 
 #include "kpLogCategories.h"
 
diff --git a/mainWindow/kpMainWindow_Edit.cpp b/mainWindow/kpMainWindow_Edit.cpp
--- a/mainWindow/kpMainWindow_Edit.cpp
+++ b/mainWindow/kpMainWindow_Edit.cpp
@@ -29,12 +29,12 @@
 #include "kpMainWindow.h"
 #include "kpMainWindowPrivate.h"
 
-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qfontmetrics.h>
-#include <qimage.h>
-#include <qlist.h>
-#include <qmenu.h>
+#include <QApplication>
+#include <QClipboard>
+#include <QFontMetrics>
+#include <QImage>
+#include <QList>
+#include <QMenu>
 #include <QDesktopWidget>
 #include <QScrollBar>
 
diff --git a/mainWindow/kpMainWindow_File.cpp b/mainWindow/kpMainWindow_File.cpp
--- a/mainWindow/kpMainWindow_File.cpp
+++ b/mainWindow/kpMainWindow_File.cpp
@@ -30,15 +30,15 @@
 #include "kpMainWindow.h"
 #include "kpMainWindowPrivate.h"
 
-#include <qaction.h>
-#include <qdatastream.h>
+#include <QAction>
+#include <QDataStream>
 #include <QDesktopWidget>
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QFileDialog>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qsize.h>
+#include <QPainter>
+#include <QPixmap>
+#include <QSize>
 #include <QPrinter>
 #include <QPrintDialog>
 #include <QScreen>
diff --git a/mainWindow/kpMainWindow_Image.cpp b/mainWindow/kpMainWindow_Image.cpp
--- a/mainWindow/kpMainWindow_Image.cpp
+++ b/mainWindow/kpMainWindow_Image.cpp
@@ -66,9 +66,9 @@
 #include <KLocalizedString>
 #include <KIconLoader>
 
-#include <qaction.h>
-#include <qmenubar.h>
-#include <qsize.h>
+#include <QAction>
+#include <QMenuBar>
+#include <QSize>
 
 
 //---------------------------------------------------------------------
diff --git a/mainWindow/kpMainWindow_StatusBar.cpp b/mainWindow/kpMainWindow_StatusBar.cpp
--- a/mainWindow/kpMainWindow_StatusBar.cpp
+++ b/mainWindow/kpMainWindow_StatusBar.cpp
@@ -31,9 +31,9 @@
 #include "mainWindow/kpMainWindow.h"
 #include "kpMainWindowPrivate.h"
 
-#include <qlabel.h>
-#include <qstatusbar.h>
-#include <qstring.h>
+#include <QLabel>
+#include <QStatusBar>
+#include <QString>
 
 #include "kpLogCategories.h"
 #include "kpDefs.h"
diff --git a/mainWindow/kpMainWindow_Tools.cpp b/mainWindow/kpMainWindow_Tools.cpp
--- a/mainWindow/kpMainWindow_Tools.cpp
+++ b/mainWindow/kpMainWindow_Tools.cpp
@@ -30,7 +30,7 @@
 #include "kpMainWindowPrivate.h"
 
 #include <QActionGroup>
-#include <qlist.h>
+#include <QList>
 
 #include <kactioncollection.h>
 #include <KSharedConfig>
diff --git a/mainWindow/kpMainWindow_View_Thumbnail.cpp b/mainWindow/kpMainWindow_View_Thumbnail.cpp
--- a/mainWindow/kpMainWindow_View_Thumbnail.cpp
+++ b/mainWindow/kpMainWindow_View_Thumbnail.cpp
@@ -30,7 +30,7 @@
 #include "kpMainWindowPrivate.h"
 #include "kpLogCategories.h"
 
-#include <qtimer.h>
+#include <QTimer>
 
 #include <KSharedConfig>
 #include <kconfiggroup.h>
diff --git a/pixmapfx/kpPixmapFX_DrawShapes.cpp b/pixmapfx/kpPixmapFX_DrawShapes.cpp
--- a/pixmapfx/kpPixmapFX_DrawShapes.cpp
+++ b/pixmapfx/kpPixmapFX_DrawShapes.cpp
@@ -31,13 +31,13 @@
 
 #include "kpPixmapFX.h"
 
-#include <math.h>
+#include <cmath>
 
-#include <qpainter.h>
-#include <qpainterpath.h>
+#include <QPainter>
+#include <QPainterPath>
 #include <QImage>
-#include <qpoint.h>
-#include <qpolygon.h>
+#include <QPoint>
+#include <QPolygon>
 
 #include "kpLogCategories.h"
 
diff --git a/pixmapfx/kpPixmapFX_GetSetPixmapParts.cpp b/pixmapfx/kpPixmapFX_GetSetPixmapParts.cpp
--- a/pixmapfx/kpPixmapFX_GetSetPixmapParts.cpp
+++ b/pixmapfx/kpPixmapFX_GetSetPixmapParts.cpp
@@ -31,12 +31,12 @@
 
 #include "kpPixmapFX.h"
 
-#include <math.h>
+#include <cmath>
 
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpoint.h>
-#include <qrect.h>
+#include <QImage>
+#include <QPainter>
+#include <QPoint>
+#include <QRect>
 
 #include "kpLogCategories.h"
 
diff --git a/pixmapfx/kpPixmapFX_Transforms.cpp b/pixmapfx/kpPixmapFX_Transforms.cpp
--- a/pixmapfx/kpPixmapFX_Transforms.cpp
+++ b/pixmapfx/kpPixmapFX_Transforms.cpp
@@ -31,12 +31,12 @@
 
 #include "kpPixmapFX.h"
 
-#include <math.h>
+#include <cmath>
 
-#include <qpainter.h>
+#include <QPainter>
 #include <QImage>
-#include <qpoint.h>
-#include <qrect.h>
+#include <QPoint>
+#include <QRect>
 
 #include "kpLogCategories.h"
 
diff --git a/tools/flow/kpToolFlowBase.cpp b/tools/flow/kpToolFlowBase.cpp
--- a/tools/flow/kpToolFlowBase.cpp
+++ b/tools/flow/kpToolFlowBase.cpp
@@ -32,8 +32,8 @@
 
 #include <cstdlib>
 
-#include <qimage.h>
-#include <qpainter.h>
+#include <QImage>
+#include <QPainter>
 
 #include "kpLogCategories.h"
 #include <KLocalizedString>
diff --git a/tools/flow/kpToolFlowPixmapBase.cpp b/tools/flow/kpToolFlowPixmapBase.cpp
--- a/tools/flow/kpToolFlowPixmapBase.cpp
+++ b/tools/flow/kpToolFlowPixmapBase.cpp
@@ -34,7 +34,7 @@
 #include "pixmapfx/kpPixmapFX.h"
 #include "commands/tools/flow/kpToolFlowCommand.h"
 
-#include <qbitmap.h>
+#include <QBitmap>
 
 //---------------------------------------------------------------------
 
diff --git a/tools/flow/kpToolSpraycan.cpp b/tools/flow/kpToolSpraycan.cpp
--- a/tools/flow/kpToolSpraycan.cpp
+++ b/tools/flow/kpToolSpraycan.cpp
@@ -46,9 +46,9 @@
 #include "kpLogCategories.h"
 #include <KLocalizedString>
 
-#include <qpoint.h>
-#include <qrect.h>
-#include <qtimer.h>
+#include <QPoint>
+#include <QRect>
+#include <QTimer>
 
 //---------------------------------------------------------------------
 
diff --git a/tools/kpTool.cpp b/tools/kpTool.cpp
--- a/tools/kpTool.cpp
+++ b/tools/kpTool.cpp
@@ -33,7 +33,7 @@
 #include "kpTool.h"
 #include "kpToolPrivate.h"
 
-#include <limits.h>
+#include <climits>
 
 #include <kactioncollection.h>
 #include "kpLogCategories.h"
diff --git a/tools/kpToolFloodFill.cpp b/tools/kpToolFloodFill.cpp
--- a/tools/kpToolFloodFill.cpp
+++ b/tools/kpToolFloodFill.cpp
@@ -40,7 +40,7 @@
 #include "kpLogCategories.h"
 #include <KLocalizedString>
 
-#include <qapplication.h>
+#include <QApplication>
 
 //---------------------------------------------------------------------
 
diff --git a/tools/kpTool_Drawing.cpp b/tools/kpTool_Drawing.cpp
--- a/tools/kpTool_Drawing.cpp
+++ b/tools/kpTool_Drawing.cpp
@@ -36,7 +36,7 @@
 #include "tools/kpTool.h"
 #include "kpToolPrivate.h"
 
-#include <qapplication.h>
+#include <QApplication>
 
 #include "kpLogCategories.h"
 
diff --git a/tools/kpTool_KeyboardEvents.cpp b/tools/kpTool_KeyboardEvents.cpp
--- a/tools/kpTool_KeyboardEvents.cpp
+++ b/tools/kpTool_KeyboardEvents.cpp
@@ -37,11 +37,11 @@
 #include "tools/kpTool.h"
 #include "kpToolPrivate.h"
 
-#include <limits.h>
+#include <climits>
 
-#include <qapplication.h>
-#include <qcursor.h>
-#include <qevent.h>
+#include <QApplication>
+#include <QCursor>
+#include <QEvent>
 
 #include <kactioncollection.h>
 #include "kpLogCategories.h"
diff --git a/tools/kpTool_Utilities.cpp b/tools/kpTool_Utilities.cpp
--- a/tools/kpTool_Utilities.cpp
+++ b/tools/kpTool_Utilities.cpp
@@ -36,8 +36,8 @@
 #include "tools/kpTool.h"
 #include "kpToolPrivate.h"
 
-#include <qcursor.h>
-#include <qpixmap.h>
+#include <QCursor>
+#include <QPixmap>
 
 #include "kpLogCategories.h"
 #include <kmessagebox.h>
diff --git a/tools/polygonal/kpToolPolygonalBase.cpp b/tools/polygonal/kpToolPolygonalBase.cpp
--- a/tools/polygonal/kpToolPolygonalBase.cpp
+++ b/tools/polygonal/kpToolPolygonalBase.cpp
@@ -31,13 +31,13 @@
 
 #include "kpToolPolygonalBase.h"
 
-#include <float.h>
-#include <math.h>
+#include <cfloat>
+#include <cmath>
 
-#include <qcursor.h>
-#include <qpoint.h>
-#include <qpolygon.h>
-#include <qrect.h>
+#include <QCursor>
+#include <QPoint>
+#include <QPolygon>
+#include <QRect>
 
 #include <KLocalizedString>
 
diff --git a/tools/rectangular/kpToolRectangularBase.cpp b/tools/rectangular/kpToolRectangularBase.cpp
--- a/tools/rectangular/kpToolRectangularBase.cpp
+++ b/tools/rectangular/kpToolRectangularBase.cpp
@@ -31,7 +31,7 @@
 
 #include "tools/rectangular/kpToolRectangularBase.h"
 
-#include <qcursor.h>
+#include <QCursor>
 
 #include "kpLogCategories.h"
 #include <KLocalizedString>
diff --git a/tools/selection/kpAbstractSelectionTool.cpp b/tools/selection/kpAbstractSelectionTool.cpp
--- a/tools/selection/kpAbstractSelectionTool.cpp
+++ b/tools/selection/kpAbstractSelectionTool.cpp
@@ -32,9 +32,9 @@
 #include "kpAbstractSelectionTool.h"
 #include "kpAbstractSelectionToolPrivate.h"
 
-#include <qcursor.h>
-#include <qmenu.h>
-#include <qtimer.h>
+#include <QCursor>
+#include <QMenu>
+#include <QTimer>
 
 #include "kpLogCategories.h"
 #include "layers/selections/kpAbstractSelection.h"
diff --git a/tools/selection/kpAbstractSelectionTool_Create.cpp b/tools/selection/kpAbstractSelectionTool_Create.cpp
--- a/tools/selection/kpAbstractSelectionTool_Create.cpp
+++ b/tools/selection/kpAbstractSelectionTool_Create.cpp
@@ -32,9 +32,9 @@
 #include "kpAbstractSelectionTool.h"
 #include "kpAbstractSelectionToolPrivate.h"
 
-#include <qcursor.h>
-#include <qpixmap.h>
-#include <qtimer.h>
+#include <QCursor>
+#include <QPixmap>
+#include <QTimer>
 
 #include <KLocalizedString>
 
diff --git a/tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp b/tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp
--- a/tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp
+++ b/tools/selection/kpAbstractSelectionTool_KeyboardEvents.cpp
@@ -37,7 +37,7 @@
 #include "commands/tools/selection/kpToolSelectionMoveCommand.h"
 #include "layers/selections/kpAbstractSelection.h"
 
-#include <qevent.h>
+#include <QKeyEvent>
 
 #include "kpLogCategories.h"
 
diff --git a/tools/selection/kpAbstractSelectionTool_Move.cpp b/tools/selection/kpAbstractSelectionTool_Move.cpp
--- a/tools/selection/kpAbstractSelectionTool_Move.cpp
+++ b/tools/selection/kpAbstractSelectionTool_Move.cpp
@@ -49,7 +49,7 @@
 #include "views/kpView.h"
 #include "views/manager/kpViewManager.h"
 
-#include <qtimer.h>
+#include <QTimer>
 
 #include <KLocalizedString>
 
diff --git a/tools/selection/text/kpToolText_CursorCalc.cpp b/tools/selection/text/kpToolText_CursorCalc.cpp
--- a/tools/selection/text/kpToolText_CursorCalc.cpp
+++ b/tools/selection/text/kpToolText_CursorCalc.cpp
@@ -43,7 +43,7 @@
 #include "views/kpView.h"
 #include "views/manager/kpViewManager.h"
 
-#include <qlist.h>
+#include <QList>
 
 #include <KLocalizedString>
 
diff --git a/tools/selection/text/kpToolText_InputMethodEvents.cpp b/tools/selection/text/kpToolText_InputMethodEvents.cpp
--- a/tools/selection/text/kpToolText_InputMethodEvents.cpp
+++ b/tools/selection/text/kpToolText_InputMethodEvents.cpp
@@ -34,7 +34,7 @@
 #include "kpToolTextPrivate.h"
 #include "commands/tools/selection/text/kpToolTextInsertCommand.h"
 
-#include <qevent.h>
+#include <QEvent>
 
 #include "kpLogCategories.h"
 
diff --git a/tools/selection/text/kpToolText_KeyboardEvents.cpp b/tools/selection/text/kpToolText_KeyboardEvents.cpp
--- a/tools/selection/text/kpToolText_KeyboardEvents.cpp
+++ b/tools/selection/text/kpToolText_KeyboardEvents.cpp
@@ -31,8 +31,8 @@
 #include "tools/selection/text/kpToolText.h"
 #include "kpToolTextPrivate.h"
 
-#include <qevent.h>
-#include <qlist.h>
+#include <QEvent>
+#include <QList>
 
 #include "kpLogCategories.h"
 #include "commands/kpCommandHistory.h"
diff --git a/tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp b/tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp
--- a/tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp
+++ b/tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp
@@ -31,8 +31,8 @@
 #include "tools/selection/text/kpToolText.h"
 #include "kpToolTextPrivate.h"
 
-#include <qevent.h>
-#include <qlist.h>
+#include <QEvent>
+#include <QList>
 
 #include "kpLogCategories.h"
 #include "commands/kpCommandHistory.h"
diff --git a/tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp b/tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp
--- a/tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp
+++ b/tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp
@@ -45,7 +45,7 @@
 #include "views/kpView.h"
 #include "views/manager/kpViewManager.h"
 
-#include <qlist.h>
+#include <QList>
 
 //---------------------------------------------------------------------
 
diff --git a/views/kpView.cpp b/views/kpView.cpp
--- a/views/kpView.cpp
+++ b/views/kpView.cpp
@@ -35,13 +35,13 @@
 #include "kpView.h"
 #include "kpViewPrivate.h"
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
-#include <qcursor.h>
-#include <qpoint.h>
-#include <qrect.h>
-#include <qregion.h>
+#include <QCursor>
+#include <QPoint>
+#include <QRect>
+#include <QRegion>
 #include <QScrollBar>
 
 #include "kpLogCategories.h"
diff --git a/views/manager/kpViewManager.cpp b/views/manager/kpViewManager.cpp
--- a/views/manager/kpViewManager.cpp
+++ b/views/manager/kpViewManager.cpp
@@ -32,9 +32,9 @@
 #include "views/manager/kpViewManager.h"
 #include "kpViewManagerPrivate.h"
 
-#include <qapplication.h>
-#include <qlist.h>
-#include <qtimer.h>
+#include <QApplication>
+#include <QList>
+#include <QTimer>
 
 #include "kpLogCategories.h"
 
diff --git a/views/manager/kpViewManager_TextCursor.cpp b/views/manager/kpViewManager_TextCursor.cpp
--- a/views/manager/kpViewManager_TextCursor.cpp
+++ b/views/manager/kpViewManager_TextCursor.cpp
@@ -50,9 +50,9 @@
 #include "kpViewManager.h"
 #include "kpViewManagerPrivate.h"
 
-#include <qapplication.h>
-#include <qlist.h>
-#include <qtimer.h>
+#include <QApplication>
+#include <QList>
+#include <QTimer>
 //#include <QInputContext>
 
 #include "kpLogCategories.h"
diff --git a/views/manager/kpViewManager_ViewUpdates.cpp b/views/manager/kpViewManager_ViewUpdates.cpp
--- a/views/manager/kpViewManager_ViewUpdates.cpp
+++ b/views/manager/kpViewManager_ViewUpdates.cpp
@@ -32,9 +32,9 @@
 #include "views/manager/kpViewManager.h"
 #include "kpViewManagerPrivate.h"
 
-#include <qapplication.h>
-#include <qlist.h>
-#include <qtimer.h>
+#include <QApplication>
+#include <QList>
+#include <QTimer>
 
 #include "kpLogCategories.h"
 
diff --git a/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp b/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp
--- a/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp
+++ b/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp
@@ -31,7 +31,7 @@
 
 #include "kpColorSimilarityCubeRenderer.h"
 
-#include <math.h>
+#include <cmath>
 
 #include <QPainter>
 #include <QPolygonF>
diff --git a/widgets/colorSimilarity/kpColorSimilarityHolder.cpp b/widgets/colorSimilarity/kpColorSimilarityHolder.cpp
--- a/widgets/colorSimilarity/kpColorSimilarityHolder.cpp
+++ b/widgets/colorSimilarity/kpColorSimilarityHolder.cpp
@@ -35,11 +35,11 @@
 #include "imagelib/kpColor.h"
 #include "kpDefs.h"
 
-#include <math.h>
+#include <cmath>
 
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qpolygon.h>
+#include <QPainter>
+#include <QPixmap>
+#include <QPolygon>
 
 #include "kpLogCategories.h"
 
diff --git a/widgets/imagelib/effects/kpEffectBalanceWidget.cpp b/widgets/imagelib/effects/kpEffectBalanceWidget.cpp
--- a/widgets/imagelib/effects/kpEffectBalanceWidget.cpp
+++ b/widgets/imagelib/effects/kpEffectBalanceWidget.cpp
@@ -39,13 +39,12 @@
 #include "kpNumInput.h"
 
 #include <cmath>
-#include <math.h>
 
-#include <qcombobox.h>
-#include <qgridlayout.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <QComboBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QLayout>
+#include <QPushButton>
 
 #if DEBUG_KP_EFFECT_BALANCE
     #include <qdatetime.h>
diff --git a/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp b/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp
--- a/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp
+++ b/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp
@@ -37,8 +37,8 @@
 #include <KLocalizedString>
 #include "kpNumInput.h"
 
-#include <qgridlayout.h>
-#include <qlabel.h>
+#include <QGridLayout>
+#include <QLabel>
 #include <QSpinBox>
 
 
diff --git a/widgets/imagelib/effects/kpEffectFlattenWidget.cpp b/widgets/imagelib/effects/kpEffectFlattenWidget.cpp
--- a/widgets/imagelib/effects/kpEffectFlattenWidget.cpp
+++ b/widgets/imagelib/effects/kpEffectFlattenWidget.cpp
@@ -41,8 +41,8 @@
 #include <KConfigGroup>
 #include <KLocalizedString>
 
-#include <qcheckbox.h>
-#include <qlayout.h>
+#include <QCheckBox>
+#include <QLayout>
 
 
 // public static
diff --git a/widgets/imagelib/effects/kpEffectHSVWidget.cpp b/widgets/imagelib/effects/kpEffectHSVWidget.cpp
--- a/widgets/imagelib/effects/kpEffectHSVWidget.cpp
+++ b/widgets/imagelib/effects/kpEffectHSVWidget.cpp
@@ -28,8 +28,8 @@
 
 #include "kpEffectHSVWidget.h"
 
-#include <qgridlayout.h>
-#include <qlabel.h>
+#include <QGridLayout>
+#include <QLabel>
 
 #include "kpLogCategories.h"
 #include <KLocalizedString>
diff --git a/widgets/imagelib/effects/kpEffectInvertWidget.cpp b/widgets/imagelib/effects/kpEffectInvertWidget.cpp
--- a/widgets/imagelib/effects/kpEffectInvertWidget.cpp
+++ b/widgets/imagelib/effects/kpEffectInvertWidget.cpp
@@ -38,10 +38,10 @@
 #include "kpLogCategories.h"
 #include <KLocalizedString>
 
-#include <qcheckbox.h>
-#include <qimage.h>
-#include <qlayout.h>
-#include <qpixmap.h>
+#include <QCheckBox>
+#include <QImage>
+#include <QLayout>
+#include <QPixmap>
 
 
 kpEffectInvertWidget::kpEffectInvertWidget (bool actOnSelection,
diff --git a/widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp b/widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp
--- a/widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp
+++ b/widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp
@@ -38,13 +38,13 @@
 #include "kpLogCategories.h"
 #include <KLocalizedString>
 
-#include <qbitmap.h>
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qimage.h>
-#include <qlayout.h>
-#include <qpixmap.h>
-#include <qradiobutton.h>
+#include <QBitmap>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QImage>
+#include <QLayout>
+#include <QPixmap>
+#include <QRadioButton>
 
 
 kpEffectReduceColorsWidget::kpEffectReduceColorsWidget (bool actOnSelection,
diff --git a/widgets/kpDocumentSaveOptionsWidget.cpp b/widgets/kpDocumentSaveOptionsWidget.cpp
--- a/widgets/kpDocumentSaveOptionsWidget.cpp
+++ b/widgets/kpDocumentSaveOptionsWidget.cpp
@@ -42,18 +42,18 @@
 #include <KSharedConfig>
 #include <KConfigGroup>
 
-#include <qapplication.h>
-#include <qboxlayout.h>
-#include <qbuffer.h>
-#include <qcombobox.h>
-#include <qevent.h>
-#include <qgridlayout.h>
-#include <qimage.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qtimer.h>
+#include <QApplication>
+#include <QBoxLayout>
+#include <QBuffer>
+#include <QComboBox>
+#include <QEvent>
+#include <QGridLayout>
+#include <QImage>
+#include <QLabel>
+#include <QLayout>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QTimer>
 
 
 kpDocumentSaveOptionsWidget::kpDocumentSaveOptionsWidget (
diff --git a/widgets/toolbars/kpToolToolBar.cpp b/widgets/toolbars/kpToolToolBar.cpp
--- a/widgets/toolbars/kpToolToolBar.cpp
+++ b/widgets/toolbars/kpToolToolBar.cpp
@@ -31,11 +31,11 @@
 
 #include "widgets/toolbars/kpToolToolBar.h"
 
-#include <qboxlayout.h>
-#include <qgridlayout.h>
-#include <qbuttongroup.h>
-#include <qevent.h>
-#include <qtoolbutton.h>
+#include <QBoxLayout>
+#include <QGridLayout>
+#include <QButtonGroup>
+#include <QKeyEvent>
+#include <QToolButton>
 
 #include "kpLogCategories.h"
 
diff --git a/widgets/toolbars/options/kpToolWidgetBase.cpp b/widgets/toolbars/options/kpToolWidgetBase.cpp
--- a/widgets/toolbars/options/kpToolWidgetBase.cpp
+++ b/widgets/toolbars/options/kpToolWidgetBase.cpp
@@ -38,13 +38,13 @@
 #include <ksharedconfig.h>
 #include "kpLogCategories.h"
 
-#include <qbitmap.h>
-#include <qcolor.h>
-#include <qevent.h>
+#include <QBitmap>
+#include <QColor>
+#include <QEvent>
 #include <QHelpEvent>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <QImage>
+#include <QPainter>
+#include <QPixmap>
 #include <QToolTip>
 
 
diff --git a/widgets/toolbars/options/kpToolWidgetBrush.cpp b/widgets/toolbars/options/kpToolWidgetBrush.cpp
--- a/widgets/toolbars/options/kpToolWidgetBrush.cpp
+++ b/widgets/toolbars/options/kpToolWidgetBrush.cpp
@@ -31,8 +31,8 @@
 
 #include "widgets/toolbars/options/kpToolWidgetBrush.h"
 
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <QPainter>
+#include <QPixmap>
 
 #include <KLocalizedString>
 
diff --git a/widgets/toolbars/options/kpToolWidgetEraserSize.cpp b/widgets/toolbars/options/kpToolWidgetEraserSize.cpp
--- a/widgets/toolbars/options/kpToolWidgetEraserSize.cpp
+++ b/widgets/toolbars/options/kpToolWidgetEraserSize.cpp
@@ -39,9 +39,9 @@
 #include "kpLogCategories.h"
 #include <KLocalizedString>
 
-#include <qbitmap.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <QBitmap>
+#include <QPainter>
+#include <QPixmap>
 
 
 static int EraserSizes [] = {2, 3, 5, 9, 17, 29};
diff --git a/widgets/toolbars/options/kpToolWidgetFillStyle.cpp b/widgets/toolbars/options/kpToolWidgetFillStyle.cpp
--- a/widgets/toolbars/options/kpToolWidgetFillStyle.cpp
+++ b/widgets/toolbars/options/kpToolWidgetFillStyle.cpp
@@ -38,9 +38,9 @@
 
 #include "kpLogCategories.h"
 
-#include <qbrush.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <QBrush>
+#include <QPainter>
+#include <QPixmap>
 
 //---------------------------------------------------------------------
 
diff --git a/widgets/toolbars/options/kpToolWidgetLineWidth.cpp b/widgets/toolbars/options/kpToolWidgetLineWidth.cpp
--- a/widgets/toolbars/options/kpToolWidgetLineWidth.cpp
+++ b/widgets/toolbars/options/kpToolWidgetLineWidth.cpp
@@ -33,9 +33,9 @@
 
 #include <KLocalizedString>
 
-#include <qbitmap.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <QBitmap>
+#include <QPainter>
+#include <QPixmap>
 
 
 static int lineWidths [] = {1, 2, 3, 5, 8};
diff --git a/widgets/toolbars/options/kpToolWidgetSpraycanSize.cpp b/widgets/toolbars/options/kpToolWidgetSpraycanSize.cpp
--- a/widgets/toolbars/options/kpToolWidgetSpraycanSize.cpp
+++ b/widgets/toolbars/options/kpToolWidgetSpraycanSize.cpp
@@ -37,10 +37,10 @@
 #include <kiconloader.h>
 #include <KLocalizedString>
 
-#include <qbitmap.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <QBitmap>
+#include <QImage>
+#include <QPainter>
+#include <QPixmap>
 
 
 static int spraycanSizes [] = {9, 17, 29};