diff --git a/src/Mod/CAM/PathSimulator/AppGL/DlgCAMSimulator.cpp b/src/Mod/CAM/PathSimulator/AppGL/DlgCAMSimulator.cpp
index e72654dd87..3a61704d21 100644
--- a/src/Mod/CAM/PathSimulator/AppGL/DlgCAMSimulator.cpp
+++ b/src/Mod/CAM/PathSimulator/AppGL/DlgCAMSimulator.cpp
@@ -24,8 +24,8 @@
 
 #include "DlgCAMSimulator.h"
 #include "MillSimulation.h"
-#include <QtGui/QMatrix4x4>
-#include <QtGui/qscreen.h>
+#include <QMatrix4x4>
+#include <QScreen>
 #include <QDateTime>
 #include <QSurfaceFormat>
 #include <QMouseEvent>
diff --git a/src/Mod/CAM/PathSimulator/AppGL/DlgCAMSimulator.h b/src/Mod/CAM/PathSimulator/AppGL/DlgCAMSimulator.h
index d5c5bc5a65..80c5b1d3a1 100644
--- a/src/Mod/CAM/PathSimulator/AppGL/DlgCAMSimulator.h
+++ b/src/Mod/CAM/PathSimulator/AppGL/DlgCAMSimulator.h
@@ -23,16 +23,10 @@
 #ifndef PATHSIMULATOR_CAMSimulatorGui_H
 #define PATHSIMULATOR_CAMSimulatorGui_H
 
-// #include <memory>
-// #include <TopoDS_Shape.hxx>
-
-// #include <Mod/CAM/App/Command.h>
-// #include <Mod/Part/App/TopoShape.h>
-// #include <Mod/CAM/PathGlobal.h>
-#include <QtGui/qwindow.h>
+#include <QWindow>
 #include <QOpenGLExtraFunctions>
-#include <QtGui/qpainter.h>
-#include <QtGui/qopenglpaintdevice.h>
+#include <QPainter>
+#include <QOpenGLPaintDevice>
 
 
 namespace MillSim
@@ -59,8 +53,7 @@ class DlgCAMSimulator: public QWindow, public QOpenGLExtraFunctions
     Q_OBJECT
 public:
     explicit DlgCAMSimulator(QWindow* parent = nullptr);
-    ~DlgCAMSimulator()
-    {}
+    ~DlgCAMSimulator() override = default;
 
     virtual void render(QPainter* painter);
     virtual void render();