diff --git a/massif-visualizer/CMakeLists.txt b/massif-visualizer/CMakeLists.txt
index 4e65bc2b..6f8a612d 100644
--- a/massif-visualizer/CMakeLists.txt
+++ b/massif-visualizer/CMakeLists.txt
@@ -25,7 +25,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/kdchart/include/KDChart
 )
 
-add_definitions(-Wall)
+add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 
 add_subdirectory(kdchart)
 add_subdirectory(massifdata)
diff --git a/massif-visualizer/app/charttab.h b/massif-visualizer/app/charttab.h
index 332057fd..84f207ad 100644
--- a/massif-visualizer/app/charttab.h
+++ b/massif-visualizer/app/charttab.h
@@ -28,6 +28,7 @@
 
 #include <QLabel>
 #include <QModelIndex>
+#include <QPrinter>
 
 class KAction;
 
diff --git a/massif-visualizer/app/configdialog.h b/massif-visualizer/app/configdialog.h
index 949bd339..7fbf4ec6 100644
--- a/massif-visualizer/app/configdialog.h
+++ b/massif-visualizer/app/configdialog.h
@@ -25,9 +25,11 @@
 
 #include <KConfigDialog>
 
+QT_BEGIN_NAMESPACE
 namespace Ui {
 class Config;
 }
+QT_END_NAMESPACE
 
 namespace Massif {
 
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartAbstractAreaBase.h b/massif-visualizer/kdchart/include/KDChart/KDChartAbstractAreaBase.h
index 42253243..8841c794 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartAbstractAreaBase.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartAbstractAreaBase.h
@@ -26,18 +26,14 @@
 #include <QPointF>
 #include <QSizeF>
 #include <QRectF>
+#include <QPainter>
+#include <QString>
 
 #include "KDChartGlobal.h"
 #include "KDChartLayoutItems.h"
 #include "KDChartRelativePosition.h"
 #include "KDChartAbstractAreaBase.h"
 
-
-QT_BEGIN_NAMESPACE
-#include <QPainter>
-#include <QString>
-QT_END_NAMESPACE
-
 namespace KDChart {
     class TextAttributes;
     class BackgroundAttributes;
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartAbstractAxis.h b/massif-visualizer/kdchart/include/KDChart/KDChartAbstractAxis.h
index 84057803..b2df5afa 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartAbstractAxis.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartAbstractAxis.h
@@ -26,6 +26,8 @@
 // #include <QObject>
 // #include <QRectF>
 // #include <QWidget>
+#include <QPainter>
+#include <QSizeF>
 
 #include "kdchart_export.h"
 #include "KDChartGlobal.h"
@@ -33,12 +35,6 @@
 #include "KDChartTextAttributes.h"
 #include "KDChartRulerAttributes.h"
 
-QT_BEGIN_NAMESPACE
-#include <QPainter>
-#include <QSizeF>
-QT_END_NAMESPACE
-
-
 namespace KDChart {
 
     class Area;
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartBarDiagram.h b/massif-visualizer/kdchart/include/KDChart/KDChartBarDiagram.h
index 36d00e1a..7d26737d 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartBarDiagram.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartBarDiagram.h
@@ -23,13 +23,11 @@
 #ifndef KDCHARTBARDIAGRAM_H
 #define KDCHARTBARDIAGRAM_H
 
+#include <QPainter>
+
 #include "KDChartAbstractCartesianDiagram.h"
 #include "KDChartBarAttributes.h"
 
-QT_BEGIN_NAMESPACE
-#include <QPainter>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
     class ThreeDBarAttributes;
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartDiagramObserver.h b/massif-visualizer/kdchart/include/KDChart/KDChartDiagramObserver.h
index e1620de4..e4ede2b3 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartDiagramObserver.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartDiagramObserver.h
@@ -28,10 +28,7 @@
 #include <QObject>
 #include <QPointer>
 #include <QModelIndex>
-
-QT_BEGIN_NAMESPACE
 #include <QAbstractItemModel>
-QT_END_NAMESPACE
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartGridAttributes.h b/massif-visualizer/kdchart/include/KDChart/KDChartGridAttributes.h
index 7e116c94..94b28840 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartGridAttributes.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartGridAttributes.h
@@ -24,13 +24,10 @@
 #define KDCHARTGRIDATTRIBUTES_H
 
 #include <QMetaType>
+#include <QPen>
 #include "KDChartGlobal.h"
 #include "KDChartEnums.h"
 
-QT_BEGIN_NAMESPACE
-#include <QPen>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
 /**
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartLayoutItems.h b/massif-visualizer/kdchart/include/KDChart/KDChartLayoutItems.h
index 535f2e1b..5467de66 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartLayoutItems.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartLayoutItems.h
@@ -29,14 +29,12 @@
 #include <QLayout>
 #include <QLayoutItem>
 #include <QPen>
+#include <QPainter>
 
 #include "KDChartTextAttributes.h"
 #include "KDChartMarkerAttributes.h"
 
-QT_BEGIN_NAMESPACE
-#include <QPainter>
 class KDTextDocument;
-QT_END_NAMESPACE
 
 // TODO remove
 QRectF rotatedRect( const QRectF& pt, qreal rotation );
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsDiagram.h b/massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsDiagram.h
index 9731c45b..82840a4c 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsDiagram.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsDiagram.h
@@ -23,14 +23,12 @@
 #ifndef KDCHARTLEVEYJENNINGSDIAGRAM_H
 #define KDCHARTLEVEYJENNINGSDIAGRAM_H
 
-#include "KDChartLineDiagram.h"
-#include "KDChartLeveyJenningsCoordinatePlane.h"
-
-QT_BEGIN_NAMESPACE
 #include <QPainter>
 #include <QPolygonF>
 #include <QSvgRenderer>
-QT_END_NAMESPACE
+
+#include "KDChartLineDiagram.h"
+#include "KDChartLeveyJenningsCoordinatePlane.h"
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsGridAttributes.h b/massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsGridAttributes.h
index 07a424c7..9661723c 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsGridAttributes.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsGridAttributes.h
@@ -24,13 +24,10 @@
 #define KDCHARTLEVEYJENNINGSGRIDATTRIBUTES_H
 
 #include <QMetaType>
+#include <QPen>
 #include "KDChartGlobal.h"
 #include "KDChartEnums.h"
 
-QT_BEGIN_NAMESPACE
-#include <QPen>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
 /**
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartLineDiagram.h b/massif-visualizer/kdchart/include/KDChart/KDChartLineDiagram.h
index 2ae9a2bf..715c8e33 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartLineDiagram.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartLineDiagram.h
@@ -23,15 +23,12 @@
 #ifndef KDCHARTLINEDIAGRAM_H
 #define KDCHARTLINEDIAGRAM_H
 
+#include <QPainter>
+#include <QPolygonF>
 #include "KDChartAbstractCartesianDiagram.h"
 #include "KDChartLineAttributes.h"
 #include "KDChartValueTrackerAttributes.h"
 
-QT_BEGIN_NAMESPACE
-#include <QPainter>
-#include <QPolygonF>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
     class ThreeDLineAttributes;
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartMarkerAttributes.h b/massif-visualizer/kdchart/include/KDChart/KDChartMarkerAttributes.h
index 366a6d77..65981aa4 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartMarkerAttributes.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartMarkerAttributes.h
@@ -24,16 +24,13 @@
 #define KDCHARTMARKERATTRIBUTES_H
 
 #include <QMetaType>
-#include "KDChartGlobal.h"
-
-QT_BEGIN_NAMESPACE
 #include <QColor>
 #include <QSizeF>
 #include <QPen>
 #include <QPainterPath>
 #include <QDebug>
 #include <QMap>
-QT_END_NAMESPACE
+#include "KDChartGlobal.h"
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartMeasure.h b/massif-visualizer/kdchart/include/KDChart/KDChartMeasure.h
index b3747272..549272a9 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartMeasure.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartMeasure.h
@@ -25,6 +25,8 @@
 
 #include <QDebug>
 #include <QStack>
+#include <QObject>
+#include <QPaintDevice>
 #include "KDChartGlobal.h"
 #include "KDChartEnums.h"
 
@@ -34,11 +36,6 @@
  *
  */
 
-QT_BEGIN_NAMESPACE
-#include <QObject>
-#include <QPaintDevice>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
 /**
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartPaintContext.h b/massif-visualizer/kdchart/include/KDChart/KDChartPaintContext.h
index 318e1e93..b08ab77f 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartPaintContext.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartPaintContext.h
@@ -24,11 +24,8 @@
 #define PAINTCONTEXT_H
 
 #include <QRectF>
-#include "KDChartGlobal.h"
-
-QT_BEGIN_NAMESPACE
 #include <QPainter>
-QT_END_NAMESPACE
+#include "KDChartGlobal.h"
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartPolarDiagram.h b/massif-visualizer/kdchart/include/KDChart/KDChartPolarDiagram.h
index 547ea3b9..d84e727f 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartPolarDiagram.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartPolarDiagram.h
@@ -23,14 +23,10 @@
 #ifndef KDCHARTPOLARDIAGRAM_H
 #define KDCHARTPOLARDIAGRAM_H
 
-
+#include <QPolygonF>
 #include "KDChartPosition.h"
 #include "KDChartAbstractPolarDiagram.h"
 
-QT_BEGIN_NAMESPACE
-#include <QPolygonF>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
 /**
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartPosition.h b/massif-visualizer/kdchart/include/KDChart/KDChartPosition.h
index 7de0f304..85cfd5a0 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartPosition.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartPosition.h
@@ -25,15 +25,12 @@
 
 #include <QDebug>
 #include <QMetaType>
-#include <QCoreApplication>
-#include "KDChartGlobal.h"
-#include "KDChartEnums.h"
-
-QT_BEGIN_NAMESPACE
 #include <QStringList>
 #include <QByteArray>
 #include <QList>
-QT_END_NAMESPACE
+#include <QCoreApplication>
+#include "KDChartGlobal.h"
+#include "KDChartEnums.h"
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartRadarDiagram.h b/massif-visualizer/kdchart/include/KDChart/KDChartRadarDiagram.h
index 1f2b0756..7f0b7610 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartRadarDiagram.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartRadarDiagram.h
@@ -23,15 +23,11 @@
 #ifndef KDCHARTRADARDIAGRAM_H
 #define KDCHARTRADARDIAGRAM_H
 
-
+#include <QPolygonF>
 #include "KDChartPosition.h"
 #include "KDChartPolarDiagram.h"
 #include "KDChartRadarCoordinatePlane.h"
 
-QT_BEGIN_NAMESPACE
-#include <QPolygonF>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
 /**
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartRulerAttributes.h b/massif-visualizer/kdchart/include/KDChart/KDChartRulerAttributes.h
index 5cf9b64b..bec7f5ba 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartRulerAttributes.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartRulerAttributes.h
@@ -24,13 +24,10 @@
 #define KDCHARTRULERATTRIBUTES_H
 
 #include <QMetaType>
+#include <QPen>
 #include "KDChartGlobal.h"
 #include "KDChartEnums.h"
 
-QT_BEGIN_NAMESPACE
-#include <QPen>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
 /**
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartTextAttributes.h b/massif-visualizer/kdchart/include/KDChart/KDChartTextAttributes.h
index 5e3109e5..7d11b399 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartTextAttributes.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartTextAttributes.h
@@ -28,11 +28,9 @@
 #include "KDChartGlobal.h"
 #include "KDChartMeasure.h"
 
-QT_BEGIN_NAMESPACE
 #include <QPen>
 #include <QFont>
 #include <QTextDocument>
-QT_END_NAMESPACE
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartWidget.h b/massif-visualizer/kdchart/include/KDChart/KDChartWidget.h
index d2db9335..c95f9535 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartWidget.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartWidget.h
@@ -26,15 +26,12 @@
 #include "KDChartGlobal.h"
 
 #include <QWidget>
+#include <QVector>
+#include <QPair>
 
 #include "KDChartEnums.h"
 #include "KDChartHeaderFooter.h"
 
-QT_BEGIN_NAMESPACE
-#include <QVector>
-#include <QPair>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
     // some forward declarations
diff --git a/massif-visualizer/kdchart/include/KDChart/ReverseMapper.h b/massif-visualizer/kdchart/include/KDChart/ReverseMapper.h
index 679ee8e8..ae4bd3b2 100644
--- a/massif-visualizer/kdchart/include/KDChart/ReverseMapper.h
+++ b/massif-visualizer/kdchart/include/KDChart/ReverseMapper.h
@@ -25,12 +25,9 @@
 
 #include <QModelIndex>
 #include <QHash>
-
-QT_BEGIN_NAMESPACE
 #include <QRectF>
 #include <QGraphicsScene>
 #include <QPolygonF>
-QT_END_NAMESPACE
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartBarDiagram.h b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartBarDiagram.h
index 36d00e1a..289394e8 100644
--- a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartBarDiagram.h
+++ b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartBarDiagram.h
@@ -23,13 +23,10 @@
 #ifndef KDCHARTBARDIAGRAM_H
 #define KDCHARTBARDIAGRAM_H
 
+#include <QPainter>
 #include "KDChartAbstractCartesianDiagram.h"
 #include "KDChartBarAttributes.h"
 
-QT_BEGIN_NAMESPACE
-#include <QPainter>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
     class ThreeDBarAttributes;
diff --git a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartCartesianDiagramDataCompressor_p.h b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartCartesianDiagramDataCompressor_p.h
index 2c9a93e7..dfba5699 100644
--- a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartCartesianDiagramDataCompressor_p.h
+++ b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartCartesianDiagramDataCompressor_p.h
@@ -41,6 +41,7 @@
 #include <QObject>
 #include <QPointer>
 #include <QModelIndex>
+#include <QAbstractItemModel>
 
 #include "KDChartDataValueAttributes.h"
 #include "KDChartModelDataCache_p.h"
@@ -48,9 +49,6 @@
 #include "kdchart_export.h"
 
 class CartesianDiagramDataCompressorTests;
-QT_BEGIN_NAMESPACE
-#include <QAbstractItemModel>
-QT_END_NAMESPACE
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram.h b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram.h
index 9731c45b..4b748560 100644
--- a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram.h
+++ b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram.h
@@ -23,14 +23,11 @@
 #ifndef KDCHARTLEVEYJENNINGSDIAGRAM_H
 #define KDCHARTLEVEYJENNINGSDIAGRAM_H
 
-#include "KDChartLineDiagram.h"
-#include "KDChartLeveyJenningsCoordinatePlane.h"
-
-QT_BEGIN_NAMESPACE
 #include <QPainter>
 #include <QPolygonF>
 #include <QSvgRenderer>
-QT_END_NAMESPACE
+#include "KDChartLineDiagram.h"
+#include "KDChartLeveyJenningsCoordinatePlane.h"
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram_p.h b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram_p.h
index 5ac81265..b3e1a03c 100644
--- a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram_p.h
+++ b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram_p.h
@@ -35,16 +35,13 @@
 //
 
 #include <QDateTime>
+#include <QSvgRenderer>
 
 #include "KDChartThreeDLineAttributes.h"
 #include "KDChartLineDiagram_p.h"
 
 #include <KDABLibFakes>
 
-QT_BEGIN_NAMESPACE
-#include <QSvgRenderer>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
     class PaintContext;
diff --git a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsGridAttributes.h b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsGridAttributes.h
index 07a424c7..9661723c 100644
--- a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsGridAttributes.h
+++ b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsGridAttributes.h
@@ -24,13 +24,10 @@
 #define KDCHARTLEVEYJENNINGSGRIDATTRIBUTES_H
 
 #include <QMetaType>
+#include <QPen>
 #include "KDChartGlobal.h"
 #include "KDChartEnums.h"
 
-QT_BEGIN_NAMESPACE
-#include <QPen>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
 /**
diff --git a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLineDiagram.h b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLineDiagram.h
index 2ae9a2bf..715c8e33 100644
--- a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLineDiagram.h
+++ b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLineDiagram.h
@@ -23,15 +23,12 @@
 #ifndef KDCHARTLINEDIAGRAM_H
 #define KDCHARTLINEDIAGRAM_H
 
+#include <QPainter>
+#include <QPolygonF>
 #include "KDChartAbstractCartesianDiagram.h"
 #include "KDChartLineAttributes.h"
 #include "KDChartValueTrackerAttributes.h"
 
-QT_BEGIN_NAMESPACE
-#include <QPainter>
-#include <QPolygonF>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
     class ThreeDLineAttributes;
diff --git a/massif-visualizer/kdchart/src/KDChart/Cartesian/PaintingHelpers_p.h b/massif-visualizer/kdchart/src/KDChart/Cartesian/PaintingHelpers_p.h
index 7e644a7b..a456cae3 100644
--- a/massif-visualizer/kdchart/src/KDChart/Cartesian/PaintingHelpers_p.h
+++ b/massif-visualizer/kdchart/src/KDChart/Cartesian/PaintingHelpers_p.h
@@ -28,7 +28,6 @@
 
 #include <QPointF>
 #include <QVector>
-
 #include <QBrush>
 #include <QModelIndex>
 #include <QPen>
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartAbstractAreaBase.h b/massif-visualizer/kdchart/src/KDChart/KDChartAbstractAreaBase.h
index 42253243..8841c794 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartAbstractAreaBase.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartAbstractAreaBase.h
@@ -26,18 +26,14 @@
 #include <QPointF>
 #include <QSizeF>
 #include <QRectF>
+#include <QPainter>
+#include <QString>
 
 #include "KDChartGlobal.h"
 #include "KDChartLayoutItems.h"
 #include "KDChartRelativePosition.h"
 #include "KDChartAbstractAreaBase.h"
 
-
-QT_BEGIN_NAMESPACE
-#include <QPainter>
-#include <QString>
-QT_END_NAMESPACE
-
 namespace KDChart {
     class TextAttributes;
     class BackgroundAttributes;
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartAbstractAxis.h b/massif-visualizer/kdchart/src/KDChart/KDChartAbstractAxis.h
index 84057803..b2df5afa 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartAbstractAxis.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartAbstractAxis.h
@@ -26,6 +26,8 @@
 // #include <QObject>
 // #include <QRectF>
 // #include <QWidget>
+#include <QPainter>
+#include <QSizeF>
 
 #include "kdchart_export.h"
 #include "KDChartGlobal.h"
@@ -33,12 +35,6 @@
 #include "KDChartTextAttributes.h"
 #include "KDChartRulerAttributes.h"
 
-QT_BEGIN_NAMESPACE
-#include <QPainter>
-#include <QSizeF>
-QT_END_NAMESPACE
-
-
 namespace KDChart {
 
     class Area;
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartAbstractCoordinatePlane_p.h b/massif-visualizer/kdchart/src/KDChart/KDChartAbstractCoordinatePlane_p.h
index 5dcd882b..22c07014 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartAbstractCoordinatePlane_p.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartAbstractCoordinatePlane_p.h
@@ -43,10 +43,7 @@
 #include <KDABLibFakes>
 
 #include <QStack>
-
-QT_BEGIN_NAMESPACE
 #include <QRubberBand>
-QT_END_NAMESPACE
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartDiagramObserver.h b/massif-visualizer/kdchart/src/KDChart/KDChartDiagramObserver.h
index e1620de4..e4ede2b3 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartDiagramObserver.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartDiagramObserver.h
@@ -28,10 +28,7 @@
 #include <QObject>
 #include <QPointer>
 #include <QModelIndex>
-
-QT_BEGIN_NAMESPACE
 #include <QAbstractItemModel>
-QT_END_NAMESPACE
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartGridAttributes.h b/massif-visualizer/kdchart/src/KDChart/KDChartGridAttributes.h
index 7e116c94..94b28840 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartGridAttributes.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartGridAttributes.h
@@ -24,13 +24,10 @@
 #define KDCHARTGRIDATTRIBUTES_H
 
 #include <QMetaType>
+#include <QPen>
 #include "KDChartGlobal.h"
 #include "KDChartEnums.h"
 
-QT_BEGIN_NAMESPACE
-#include <QPen>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
 /**
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartLayoutItems.h b/massif-visualizer/kdchart/src/KDChart/KDChartLayoutItems.h
index 535f2e1b..5467de66 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartLayoutItems.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartLayoutItems.h
@@ -29,14 +29,12 @@
 #include <QLayout>
 #include <QLayoutItem>
 #include <QPen>
+#include <QPainter>
 
 #include "KDChartTextAttributes.h"
 #include "KDChartMarkerAttributes.h"
 
-QT_BEGIN_NAMESPACE
-#include <QPainter>
 class KDTextDocument;
-QT_END_NAMESPACE
 
 // TODO remove
 QRectF rotatedRect( const QRectF& pt, qreal rotation );
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartLegend_p.h b/massif-visualizer/kdchart/src/KDChart/KDChartLegend_p.h
index d75ac7fa..cd60d88c 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartLegend_p.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartLegend_p.h
@@ -43,14 +43,12 @@
 #include <QAbstractTextDocumentLayout>
 #include <QPainter>
 #include <QVector>
+#include <QGridLayout>
+#include <QTextDocument>
 
 #include <KDABLibFakes>
 
-QT_BEGIN_NAMESPACE
-#include <QGridLayout>
 class KDTextDocument;
-#include <QTextDocument>
-QT_END_NAMESPACE
 
 namespace KDChart {
     class AbstractDiagram;
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartMarkerAttributes.h b/massif-visualizer/kdchart/src/KDChart/KDChartMarkerAttributes.h
index 366a6d77..65981aa4 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartMarkerAttributes.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartMarkerAttributes.h
@@ -24,16 +24,13 @@
 #define KDCHARTMARKERATTRIBUTES_H
 
 #include <QMetaType>
-#include "KDChartGlobal.h"
-
-QT_BEGIN_NAMESPACE
 #include <QColor>
 #include <QSizeF>
 #include <QPen>
 #include <QPainterPath>
 #include <QDebug>
 #include <QMap>
-QT_END_NAMESPACE
+#include "KDChartGlobal.h"
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartMeasure.h b/massif-visualizer/kdchart/src/KDChart/KDChartMeasure.h
index b3747272..549272a9 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartMeasure.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartMeasure.h
@@ -25,6 +25,8 @@
 
 #include <QDebug>
 #include <QStack>
+#include <QObject>
+#include <QPaintDevice>
 #include "KDChartGlobal.h"
 #include "KDChartEnums.h"
 
@@ -34,11 +36,6 @@
  *
  */
 
-QT_BEGIN_NAMESPACE
-#include <QObject>
-#include <QPaintDevice>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
 /**
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartModelDataCache_p.h b/massif-visualizer/kdchart/src/KDChart/KDChartModelDataCache_p.h
index 64a022c0..1936a15e 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartModelDataCache_p.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartModelDataCache_p.h
@@ -28,13 +28,10 @@
 #include <QObject>
 #include <QModelIndex>
 #include <QVector>
+#include <QAbstractItemModel>
 
 #include "kdchart_export.h"
 
-QT_BEGIN_NAMESPACE
-#include <QAbstractItemModel>
-QT_END_NAMESPACE
-
 namespace KDChart
 {
     namespace ModelDataCachePrivate
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartPaintContext.h b/massif-visualizer/kdchart/src/KDChart/KDChartPaintContext.h
index 318e1e93..b08ab77f 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartPaintContext.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartPaintContext.h
@@ -24,11 +24,8 @@
 #define PAINTCONTEXT_H
 
 #include <QRectF>
-#include "KDChartGlobal.h"
-
-QT_BEGIN_NAMESPACE
 #include <QPainter>
-QT_END_NAMESPACE
+#include "KDChartGlobal.h"
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartPosition.h b/massif-visualizer/kdchart/src/KDChart/KDChartPosition.h
index 7de0f304..7e936344 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartPosition.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartPosition.h
@@ -26,14 +26,11 @@
 #include <QDebug>
 #include <QMetaType>
 #include <QCoreApplication>
-#include "KDChartGlobal.h"
-#include "KDChartEnums.h"
-
-QT_BEGIN_NAMESPACE
 #include <QStringList>
 #include <QByteArray>
 #include <QList>
-QT_END_NAMESPACE
+#include "KDChartGlobal.h"
+#include "KDChartEnums.h"
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartRulerAttributes.h b/massif-visualizer/kdchart/src/KDChart/KDChartRulerAttributes.h
index 5cf9b64b..bec7f5ba 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartRulerAttributes.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartRulerAttributes.h
@@ -24,13 +24,10 @@
 #define KDCHARTRULERATTRIBUTES_H
 
 #include <QMetaType>
+#include <QPen>
 #include "KDChartGlobal.h"
 #include "KDChartEnums.h"
 
-QT_BEGIN_NAMESPACE
-#include <QPen>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
 /**
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartTextAttributes.h b/massif-visualizer/kdchart/src/KDChart/KDChartTextAttributes.h
index 5e3109e5..623848c6 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartTextAttributes.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartTextAttributes.h
@@ -25,14 +25,11 @@
 
 #include <QDebug>
 #include <QMetaType>
-#include "KDChartGlobal.h"
-#include "KDChartMeasure.h"
-
-QT_BEGIN_NAMESPACE
 #include <QPen>
 #include <QFont>
 #include <QTextDocument>
-QT_END_NAMESPACE
+#include "KDChartGlobal.h"
+#include "KDChartMeasure.h"
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartWidget.h b/massif-visualizer/kdchart/src/KDChart/KDChartWidget.h
index d2db9335..c95f9535 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartWidget.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartWidget.h
@@ -26,15 +26,12 @@
 #include "KDChartGlobal.h"
 
 #include <QWidget>
+#include <QVector>
+#include <QPair>
 
 #include "KDChartEnums.h"
 #include "KDChartHeaderFooter.h"
 
-QT_BEGIN_NAMESPACE
-#include <QVector>
-#include <QPair>
-QT_END_NAMESPACE
-
 namespace KDChart {
 
     // some forward declarations
diff --git a/massif-visualizer/kdchart/src/KDChart/ReverseMapper.h b/massif-visualizer/kdchart/src/KDChart/ReverseMapper.h
index 679ee8e8..ae4bd3b2 100644
--- a/massif-visualizer/kdchart/src/KDChart/ReverseMapper.h
+++ b/massif-visualizer/kdchart/src/KDChart/ReverseMapper.h
@@ -25,12 +25,9 @@
 
 #include <QModelIndex>
 #include <QHash>
-
-QT_BEGIN_NAMESPACE
 #include <QRectF>
 #include <QGraphicsScene>
 #include <QPolygonF>
-QT_END_NAMESPACE
 
 namespace KDChart {
 
diff --git a/massif-visualizer/massifdata/parser.cpp b/massif-visualizer/massifdata/parser.cpp
index 911dbf08..b029164a 100644
--- a/massif-visualizer/massifdata/parser.cpp
+++ b/massif-visualizer/massifdata/parser.cpp
@@ -27,6 +27,7 @@
 #include "snapshotitem.h"
 
 #include <QtCore/QIODevice>
+#include <QtCore/QScopedPointer>
 
 using namespace Massif;
 
diff --git a/massif-visualizer/massifdata/parserprivate.cpp b/massif-visualizer/massifdata/parserprivate.cpp
index 5b183d4a..2326ec01 100644
--- a/massif-visualizer/massifdata/parserprivate.cpp
+++ b/massif-visualizer/massifdata/parserprivate.cpp
@@ -307,7 +307,7 @@ void ParserPrivate::parseHeapTreeLeaf(const QByteArray& line)
         }
         if (belowThreshold) {
             QByteArray label = belowThreshold->label();
-            label.replace(oldPlaces, QByteArray::number(places));
+            label.replace(oldPlaces.toUtf8(), QByteArray::number(places));
             belowThreshold->setLabel(label);
         }
         qSort(newChildren.begin(), newChildren.end(), sortLeafsByCost);
diff --git a/massif-visualizer/visualizer/detailedcostmodel.cpp b/massif-visualizer/visualizer/detailedcostmodel.cpp
index 5b4cec17..457289be 100644
--- a/massif-visualizer/visualizer/detailedcostmodel.cpp
+++ b/massif-visualizer/visualizer/detailedcostmodel.cpp
@@ -118,7 +118,7 @@ void DetailedCostModel::setSource(const FileData* data)
         }
         // ugh, yet another bad usage of QList in Qt's API
         m_columns = sortColumnMap.values().toVector();
-        QAlgorithmsPrivate::qReverse(m_columns.begin(), m_columns.end());
+        std::reverse(m_columns.begin(), m_columns.end());
 
         if (m_rows.isEmpty()) {
             return;
diff --git a/massif-visualizer/visualizer/dotgraphgenerator.cpp b/massif-visualizer/visualizer/dotgraphgenerator.cpp
index a1685cbc..9dd65e72 100644
--- a/massif-visualizer/visualizer/dotgraphgenerator.cpp
+++ b/massif-visualizer/visualizer/dotgraphgenerator.cpp
@@ -52,7 +52,9 @@ struct GraphNode {
 
 }
 
+QT_BEGIN_NAMESPACE
 Q_DECLARE_TYPEINFO(Massif::GraphNode, Q_MOVABLE_TYPE);
+QT_END_NAMESPACE
 
 using namespace Massif;