diff --git a/include/analysePlot.h b/include/analysePlot.h
index 82b678f6ad984ccca5cc5ac28b0476bc4ecb4f51..b68b5b234c32216926bfefa0daaf52148afa5fd2 100644
--- a/include/analysePlot.h
+++ b/include/analysePlot.h
@@ -21,8 +21,6 @@
 #ifndef ANALYSEPLOT_H
 #define ANALYSEPLOT_H
 
-//#ifdef QWT // kann nicht nur in .pro ausgeschlossen werden, da auch von ui benutzt wird
-
 #include <QPen>
 
 #include <qwt_plot.h>
diff --git a/include/animation.h b/include/animation.h
index 51a79bfdd1286b06a5f5a3e8ab484ecd39dd2a7f..b4d3cccb4505803a2a37df093ccbda512fc6e189 100644
--- a/include/animation.h
+++ b/include/animation.h
@@ -42,13 +42,10 @@ they can be represented in QT.
 #include <QImage>
 #include <QStringList>
 #include <QTime>
+#include <QFileInfo>
 
+#include <opencv2/opencv.hpp>
 
-#include "opencv2/opencv.hpp"
-
-#include "filter.h"
-#include "helper.h"
-#include "petrack.h"
 #ifdef STEREO
 #include "pgrAviFile.h"
 #else
diff --git a/include/aviFileWriter.h b/include/aviFileWriter.h
index 3462253ee2239de130d977271ae5900f67e7d727..a8d6cf45e959214c2f7cf1eff01f118be728e2c0 100644
--- a/include/aviFileWriter.h
+++ b/include/aviFileWriter.h
@@ -23,18 +23,7 @@
 #ifndef AVIFILEWRITER_H
 #define AVIFILEWRITER_H
 
-//=============================================================================
-// System Includes
-//=============================================================================
-
-//=============================================================================
-// OpenCV Includes
-//=============================================================================
-#include "opencv2/opencv.hpp"
-
-//=============================================================================
-// Project Includes
-//=============================================================================
+#include <opencv2/opencv.hpp>
 
 // Byte Number (nicht alle Zahlen gehen?: 2*1280*960*32*20) enstehen avi mit einem bild
 // unter 2GB fuer reader und unter 4 GB fuer writer bleiben!!!
diff --git a/include/backgroundFilter.h b/include/backgroundFilter.h
index 4814bcbf73d04e5ca8189c1e83069d60c882c499..fc0144344e6484f8111e685eb92d9a20654bc0c2 100644
--- a/include/backgroundFilter.h
+++ b/include/backgroundFilter.h
@@ -23,17 +23,13 @@
 
 #include "filter.h"
 
-
-#include "opencv2/opencv.hpp"
-#include "opencv2/video/background_segm.hpp"
-
-
 #include <QString>
 
+#include <opencv2/opencv.hpp>
+#include <opencv2/video/background_segm.hpp>
+
 #include "stereoContext.h"
-//#include "opencv2/video/background_segm.hpp"
 
-//class pet::StereoContext;
 
 class BackgroundFilter : public Filter
 {
diff --git a/include/blurFilter.h b/include/blurFilter.h
index 71e78617c22c801454434b35e627a644a7d837c5..f57a4b8f51ab1a5bc316d52a6d6266ea41314db5 100644
--- a/include/blurFilter.h
+++ b/include/blurFilter.h
@@ -21,8 +21,8 @@
 #ifndef BLURFILTER_H
 #define BLURFILTER_H
 
+#include <opencv2/opencv.hpp>
 #include "filter.h"
-#include "opencv2/opencv.hpp"
 
 class BlurFilter : public Filter
 {
diff --git a/include/borderFilter.h b/include/borderFilter.h
index 6b23a62fc5f716b7482a1b71e447081f1fb6f4d2..df70b0cadce07276e9e50034904dc89cffb722c3 100644
--- a/include/borderFilter.h
+++ b/include/borderFilter.h
@@ -23,7 +23,6 @@
 
 #include "filter.h"
 
-
 class BorderFilter : public Filter
 {
 private:
diff --git a/include/calibStereoFilter.h b/include/calibStereoFilter.h
index 0535df6ecc3625274c83b0701274f7216faafbf2..0d50465c4c40316b47527dee35ea2a032a387653 100644
--- a/include/calibStereoFilter.h
+++ b/include/calibStereoFilter.h
@@ -24,7 +24,6 @@
 #include "filter.h"
 #include "stereoContext.h"
 
-
 class CalibStereoFilter : public Filter
 {
 private:
diff --git a/include/codeMarkerItem.h b/include/codeMarkerItem.h
index c5d23739122aed940fb1ac27c892ee33fb72c4e9..bd5b8307451a8e110629231871627fe4d7b3f318 100644
--- a/include/codeMarkerItem.h
+++ b/include/codeMarkerItem.h
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef CodeMarkerItem_H
-#define CodeMarkerItem_H
+#ifndef CODEMARKERITEM_H
+#define CODEMARKERITEM_H
 
 #include <QGraphicsItem>
 
diff --git a/include/codeMarkerWidget.h b/include/codeMarkerWidget.h
index ea849656ce945c1b7a76a232106100f08f4eebad..3b5d02d8e208ed3632198460e07d6a29263e72d7 100644
--- a/include/codeMarkerWidget.h
+++ b/include/codeMarkerWidget.h
@@ -22,7 +22,7 @@
 #define CODEMARKERWIDGET_H
 
 #include <QtWidgets>
-#include "opencv2/aruco.hpp"
+#include <opencv2/aruco.hpp>
 
 #include "ui_codeMarker.h"
 
diff --git a/include/colorMarkerItem.h b/include/colorMarkerItem.h
index 39e1375f767ac94ba1d4204533851998a3b459c3..8b501a824ddd457610689f96ebd98657385f8285 100644
--- a/include/colorMarkerItem.h
+++ b/include/colorMarkerItem.h
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef ColorMarkerItem_H
-#define ColorMarkerItem_H
+#ifndef COLORMARKERITEM_H
+#define COLORMARKERITEM_H
 
 #include <QGraphicsItem>
 
diff --git a/include/colorPlot.h b/include/colorPlot.h
index 25a575a408a2b5bd8d469997ff31d05882b68f52..6be2a9399be11951d550e35c1bcca2f6d279dfa2 100644
--- a/include/colorPlot.h
+++ b/include/colorPlot.h
@@ -26,11 +26,11 @@
 #include <qwt_plot.h>
 
 #include "helper.h"
-#include "tracker.h"
 
 #define DEFAULT_HEIGHT 180.0
 
 class ImagePlotItem;
+class Tracker;
 class TrackerPlotItem;
 class Control;
 class Zoomer;
diff --git a/include/coordItem.h b/include/coordItem.h
index 581ac386eabab2d96144dc50ebb250461fe8d8fc..ca21934ee9e995fecb0e2a111eefb71368ec4c2b 100644
--- a/include/coordItem.h
+++ b/include/coordItem.h
@@ -1,4 +1,4 @@
-/*
+/*
  * PeTrack - Software for tracking pedestrians movement in videos
  * Copyright (C) 2010-2020 Forschungszentrum Jülich GmbH,
  * Maik Boltes, Juliane Adrian, Ricardo Martin Brualla, Arne Graf, Paul Häger, Daniel Hillebrand,
@@ -23,7 +23,6 @@
 
 #include <QGraphicsItem>
 #include <QtWidgets>
-//#include <opencv.hpp>
 #include <petrack.h>
 
 class Petrack;
diff --git a/include/ellipse.h b/include/ellipse.h
index d567918e8a3a66fe2609996d8a8bce7589bd5780..b471bb2fe211922829b88fdb8807112ce2672452 100644
--- a/include/ellipse.h
+++ b/include/ellipse.h
@@ -21,8 +21,7 @@
 #ifndef ELLIPSE_H
 #define ELLIPSE_H
 
-
-#include "opencv2/opencv.hpp"
+#include <opencv2/opencv.hpp>
 
 #include "vector.h"
 
diff --git a/include/extrCalibration.h b/include/extrCalibration.h
index bca9028730962c87e042583a99ac183f05af911d..ad6feb5537c7b6149a9bdd7b535c1f4374670134 100644
--- a/include/extrCalibration.h
+++ b/include/extrCalibration.h
@@ -27,14 +27,7 @@
 #include <QString>
 #include <QVector>
 
-//#include <opencv.hpp>
-
-//#include "opencv/cxcore.h"
-//#include "opencv/cvaux.h"
-#include "opencv2/opencv.hpp"
-
-
-
+#include <opencv2/opencv.hpp>
 
 class Petrack;
 class Control;
diff --git a/include/filter.h b/include/filter.h
index be0294f1c3c3beba3d4f94d31fa0648ad9888eac..70093b8159a18bdf1e4b0a7bf2d0ee8f67c26541 100644
--- a/include/filter.h
+++ b/include/filter.h
@@ -21,8 +21,7 @@
 #ifndef FILTER_H
 #define FILTER_H
 
-
-#include "opencv2/opencv.hpp"
+#include <opencv2/opencv.hpp>
 
 class Filter;
 
diff --git a/include/gridItem.h b/include/gridItem.h
index e4c719c2f21a4bbec2312378e875764fd4a0c72f..350c9140cd9502ed26c8b5eee6019a2e06a4326a 100644
--- a/include/gridItem.h
+++ b/include/gridItem.h
@@ -25,7 +25,6 @@ class Petrack;
 class Control;
 
 #include "extrCalibration.h"
-#include "petrack.h"
 
 class GridItem : public QGraphicsItem
 {
diff --git a/include/helper.h b/include/helper.h
index 6fb2fb67a15f2e2a25ca9797aa17763424a21ac5..67de489d7563deb7fa2bc3646ff6a1db52614ce8 100644
--- a/include/helper.h
+++ b/include/helper.h
@@ -22,7 +22,8 @@
 #define HELPER_H
 
 #include <opencv2/opencv.hpp>
-#include "QFileInfo"
+#include <QFileInfo>
+#include <QString>
 
 extern QString commandLineOptionsString;
 
@@ -266,7 +267,7 @@ inline QString getFileList(const QString &fileName, const QString &relToFileName
         return fileName+";"+seqRelToPro;
 }
 
-#include "time.h"
+#include <ctime>
 inline clock_t getElapsedTime()
 {
     static clock_t lastTime = clock();
diff --git a/include/imageItem.h b/include/imageItem.h
index 78d011d764f8b1a14d34d42a4473997d3eee260b..810cfc55647a345816336ff0f800bff0e0ea7944 100644
--- a/include/imageItem.h
+++ b/include/imageItem.h
@@ -22,9 +22,6 @@
 #define IMAGEITEM_H
 
 #include <QGraphicsItem>
-//#include <QtWidgets>
-//#include <QDragEnterEvent>
-//#include <QDropEvent>
 
 class Petrack;
 class Control;
diff --git a/include/logoItem.h b/include/logoItem.h
index 4b14b4a719c574916e4ce6e1703f2ff1acb8d8f8..686fc01c3beed579e0d2a97678cd6c40287bbe57 100644
--- a/include/logoItem.h
+++ b/include/logoItem.h
@@ -22,9 +22,6 @@
 #define LOGOITEM_H
 
 #include <QGraphicsItem>
-//#include <QtWidgets>
-//#include <QDragEnterEvent>
-//#include <QDropEvent>
 
 class Petrack;
 class LogoItem;
diff --git a/include/markerCasern.h b/include/markerCasern.h
index d4a542480855d6aa5327d45e6d04bc2db39e365f..af5c6c993f166aa00b4e285d0fb6a036f1027f3c 100644
--- a/include/markerCasern.h
+++ b/include/markerCasern.h
@@ -27,7 +27,6 @@
 #include "ellipse.h"
 
 
-
 class TrackPoint;
 
 class MarkerCasern
diff --git a/include/markerJapan.h b/include/markerJapan.h
index 3b61f04651b372b0728aa97d132ec63dee3f7c74..7518ca9a324830ea7b0df0e9dbf4bc893df1fe9a 100644
--- a/include/markerJapan.h
+++ b/include/markerJapan.h
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef MarkerJapan_H
-#define MarkerJapan_H
+#ifndef MARKERJAPAN_H
+#define MARKERJAPAN_H
 
 #include <QList>
 #include <QColor>
diff --git a/include/multiColorMarkerItem.h b/include/multiColorMarkerItem.h
index 41d9adc61d4210ed8a0316fc389066ad2937f467..31055aad3d25aa28cc688aa4d8cc31607e469df7 100644
--- a/include/multiColorMarkerItem.h
+++ b/include/multiColorMarkerItem.h
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef MultiColorMarkerItem_H
-#define MultiColorMarkerItem_H
+#ifndef MULTICOLORMARKERITEM_H
+#define MULTICOLORMARKERITEM_H
 
 #include <QGraphicsItem>
 
diff --git a/include/person.h b/include/person.h
index e9e1c5ea3cbe0d5d87d4aeb43a0995ed8edbb8af..b6618aaf82664c1c86995be41cf6533bf8a56d3e 100644
--- a/include/person.h
+++ b/include/person.h
@@ -22,11 +22,11 @@
 #define PERSON_H
 
 #include <QList>
+
 #include "ellipse.h"
 #include "stereoContext.h"
 #include "backgroundFilter.h"
 #include "tracker.h"
-//#include "opencv2/core/types_c.h"
 
 #define STEP_SIZE 5 //10 // Hoehenschritte der Isolinien in cm
 #define DISP_GAP_SIZE_TO_FILL 15 // 15 pixel innerhalb einer Zeile werden linear in disp interpoliert
diff --git a/include/petrack.h b/include/petrack.h
index afd2c44e42973268b573a0633966dfcd78b42ef4..e8351780a7896ee52d72469fdc49d40688b3d68e 100644
--- a/include/petrack.h
+++ b/include/petrack.h
@@ -26,30 +26,26 @@
 #include <QKeyEvent>
 #include <QMouseEvent>
 
-
-#include "opencv2/opencv.hpp"
-//#include "opencv2/cxcore.h"
-//#include "opencv2/cvaux.h"
-//#include "opencv2/opencv.hpp"
+#include <opencv2/opencv.hpp>
 
 #ifdef STEREO
 #include "stereoContext.h"
 #include "calibStereoFilter.h"
 #endif
-#include "helper.h"
 #include "brightContrastFilter.h"
-#include "calibFilter.h"
 #include "borderFilter.h"
 #include "swapFilter.h"
 #include "backgroundFilter.h"
 #include "autoCalib.h"
 #include "coordItem.h"
-#include "gridItem.h"
-#include "recognitionRoiItem.h"
-#include "trackingRoiItem.h"
-#include "animation.h"
 #include "extrCalibration.h"
 
+class CalibFilter;
+class Animation;
+class TrackingRoiItem;
+class RecognitionRoiItem;
+class GridItem;
+
 #ifdef STEREO_DISABLED
 enum Camera {cameraLeft, cameraRight, cameraUnset};
 #endif
@@ -87,8 +83,6 @@ class MultiColorMarkerItem;
 class BackgroundItem;
 class Tracker;
 class TrackerReal;
-//class ExtrCalibration;
-//enum class Dimension;
 
 class Petrack : public QMainWindow
 {
diff --git a/include/player.h b/include/player.h
index 3dc23d1a9db986ff3060f82d5c0a1dbcbbae3473..56045cabb0e2dfbf2bfa652b85929b55b6fcdfbd 100644
--- a/include/player.h
+++ b/include/player.h
@@ -30,7 +30,7 @@
 #include "aviFileWriter.h"
 #endif
 
-#include "opencv2/opencv.hpp"
+#include <opencv2/opencv.hpp>
 
 class QLabel;
 class QSlider;
diff --git a/include/recognition.h b/include/recognition.h
index 568452ad182f5c02684e53011f546aab943a8183..df6324ad6bc123acb4856ea026393ca569e6e4d1 100644
--- a/include/recognition.h
+++ b/include/recognition.h
@@ -21,8 +21,6 @@
 #ifndef RECOGNITION_H
 #define RECOGNITION_H
 
-//#include <cxcore.h>
-
 #include <QList>
 #include "vector.h"
 #include <opencv2/aruco.hpp>
diff --git a/include/tracker.h b/include/tracker.h
index d5ce743c41a02ddbdb050109c911c9b78e235486..efeb7fd32f419f62f6c8d29da2e3d883f4200934 100644
--- a/include/tracker.h
+++ b/include/tracker.h
@@ -25,11 +25,7 @@
 #include <QColor>
 #include <QTextStream>
 
-//#include <opencv2/core/core.hpp>
-
-
 #include "vector.h"
-
 #include "petrack.h"
 
 #define EXTRAPOLATE_FACTOR 3. // war 1.5, aber bei bildauslassungen kann es ungewollt zuschlagen (bei 3 ist ein ausgelassener frame mgl, bei 2 wieder ein problem)
diff --git a/include/trackerReal.h b/include/trackerReal.h
index 0dde19968cf2c66bff9d977515d64b033f3dfe30..7da500a352caffd8ecc1ef95dee5705c12c18129 100644
--- a/include/trackerReal.h
+++ b/include/trackerReal.h
@@ -22,7 +22,6 @@
 #define TRACKERREAL_H
 
 #include <QList>
-//#include <QTextStream>
 
 #include "vector.h"
 #include "tracker.h"
diff --git a/include/vector.h b/include/vector.h
index 15406bba118d6c5a601674fbda719a627f7f6cd3..602e1bd33248dabf9495ee1135c9ccf90b1afedc 100644
--- a/include/vector.h
+++ b/include/vector.h
@@ -18,13 +18,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef VECTOR_HH
-#define VECTOR_HH
+#ifndef VECTOR_H
+#define VECTOR_H
 
 #include "helper.h"
 
 #include <QVector3D>
-#include "opencv2/core/types_c.h"
+#include <opencv2/core/types_c.h>
 #include <QMatrix4x4>
 
 struct CvPoint;
diff --git a/include/view.h b/include/view.h
index 13bdcd8cb5381c869bc7a39b3052549f34cbf724..3508767f9edfd98252b3686c61d2649a1feaa60b 100644
--- a/include/view.h
+++ b/include/view.h
@@ -26,7 +26,6 @@
 #include <QSlider>
 #include <QKeyEvent>
 
-
 class Petrack;
 class QLabel;
 class QToolButton;
diff --git a/src/analysePlot.cpp b/src/analysePlot.cpp
index 325ebd9500704979969e32e21ca0aca2c7b5f6b7..ce7777566ecfaf73c90071cb1ff0df0bda82eee0 100644
--- a/src/analysePlot.cpp
+++ b/src/analysePlot.cpp
@@ -21,16 +21,12 @@
 #include <QPainter>
 #include <QMouseEvent>
 
-#include "qwt_plot_layout.h"
-#include "qwt_plot_zoomer.h"
-//#include "qwt_plot_panner.h"
-//#include "qwt_plot_curve.h"
-#include "qwt_symbol.h"
-#include "qwt_scale_engine.h"
-#include "qwt_plot_grid.h"
-//#include "qwt_text.h"
-#include "qwt_compat.h"
-//#include "qwt_plot.h"
+#include <qwt_plot_layout.h>
+#include <qwt_plot_zoomer.h>
+#include <qwt_symbol.h>
+#include <qwt_scale_engine.h>
+#include <qwt_plot_grid.h>
+#include <qwt_compat.h>
 
 #include "analysePlot.h"
 #include "control.h"
diff --git a/src/animation.cpp b/src/animation.cpp
index 609e69c1a756249f32cf725cf33dbc174dcb41d8..24fab6940f4015c30a97ea8e3c5c232a830133ba 100644
--- a/src/animation.cpp
+++ b/src/animation.cpp
@@ -31,32 +31,25 @@ Appart from that, there is a static function that converts IplImages to QImage,
 they can be represented in QT.
 
 */
+#include "animation.h"
 
 #include <QWidget>
-#include <QPair>
-#include <QPixmap>
 #include <QSize>
-#include <QImage>
 #include <QStringList>
 #include <QRegExp>
 #include <QFileInfo>
 #include <QDir>
-#include <QList>
 #include <QTime>
-#include <QThread>
 
-#include <string>
-#include <fstream>
 #include <sstream>
-#include <cstring>
-#include <cstdlib>
 #include <iomanip>
 
-
-#include "opencv2/opencv.hpp"
+#include <opencv2/opencv.hpp>
 
 #include "pMessageBox.h"
-#include "animation.h"
+#include "filter.h"
+#include "helper.h"
+#include "petrack.h"
 
 using namespace::cv;
 using namespace std;
diff --git a/src/autoCalib.cpp b/src/autoCalib.cpp
index f9446707752129320ab589b28e3a786d2339088e..87a5ac12485d85de7bc1bbbecf4a2c4a4287356c 100644
--- a/src/autoCalib.cpp
+++ b/src/autoCalib.cpp
@@ -23,7 +23,7 @@
 #include <QProgressDialog>
 #include <QApplication>
 
-#include "opencv2/highgui.hpp"
+#include <opencv2/highgui.hpp>
 
 #include "autoCalib.h"
 #include "petrack.h"
diff --git a/src/aviFileWriter.cpp b/src/aviFileWriter.cpp
index 32bdfbae2eea706c5a6663c25238fde8e927d201..ff5c5fed22a221c4405466f0ddc87d16c3c1a357 100644
--- a/src/aviFileWriter.cpp
+++ b/src/aviFileWriter.cpp
@@ -18,24 +18,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
-
-//=============================================================================
-// System Includes
-//=============================================================================
 #include <cassert>
 #include <cstdio>
-#include <limits.h>
 #include <iostream>
 
-//=============================================================================
-// Project Includes
-//=============================================================================
 #include "aviFileWriter.h"
-//#include "helper.h"
 #include <opencv2/videoio/videoio_c.h>
 
-
 using namespace::cv;
 using namespace::std;
 //
diff --git a/src/backgroundFilter.cpp b/src/backgroundFilter.cpp
index 6e1fa3596e4f02ca2e93e2c0b1bcc0ee1ddc3fe8..2d5456c6deeaa97a94777388824d01ea20156146 100644
--- a/src/backgroundFilter.cpp
+++ b/src/backgroundFilter.cpp
@@ -22,7 +22,7 @@
 #include "stereoContext.h"
 
 // nur temporaer fuer anzeige
-#include "opencv2/highgui.hpp"
+#include <opencv2/highgui.hpp>
 #include "helper.h"
 
 // spaeter entfernen naechsten beiden zeilen
diff --git a/src/blurFilter.cpp b/src/blurFilter.cpp
index c9c40bb3a4d02f156fc7cb7e9989bc56ff8aa6c3..b715c9c576777f8dfb3d01a1df7c4d3da4120b85 100644
--- a/src/blurFilter.cpp
+++ b/src/blurFilter.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "blurFilter.h"
-#include "opencv2/opencv.hpp"
+#include <opencv2/opencv.hpp>
 
 using namespace::cv;
 
diff --git a/src/borderFilter.cpp b/src/borderFilter.cpp
index 36d27d3a1f0659cd361409e2185767437fd5dc2d..0af44f0c24415c1255c02192d0d73070f4244094 100644
--- a/src/borderFilter.cpp
+++ b/src/borderFilter.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "borderFilter.h"
-#include "helper.h"
 
 using namespace::cv;
 
diff --git a/src/codeMarkerItem.cpp b/src/codeMarkerItem.cpp
index 79aa4085749e6aa3bead7bb5fbfae75c7b61498b..53784d23e066a1ac0565abbafba2663d7dbc419b 100644
--- a/src/codeMarkerItem.cpp
+++ b/src/codeMarkerItem.cpp
@@ -25,7 +25,6 @@
 #include "codeMarkerItem.h"
 #include "codeMarkerWidget.h"
 #include "tracker.h"
-#include "animation.h"
 #include "control.h"
 
 using namespace::cv;
diff --git a/src/colorPlot.cpp b/src/colorPlot.cpp
index e9c270556a9a739080f2c7126624d54c29a4d8b0..039e8aacd190bc304a4f14ad44c10ff03549a1eb 100644
--- a/src/colorPlot.cpp
+++ b/src/colorPlot.cpp
@@ -23,17 +23,15 @@
 #include <QPainter>
 #include <QMouseEvent>
 
-#include "qwt_plot_layout.h"
-#include "qwt_plot_zoomer.h"
-//#include "qwt_plot_panner.h"
-//#include "qwt_plot_curve.h"
-#include "qwt_symbol.h"
-#include "qwt_scale_engine.h"
-//#include "qwt_plot_canvas.h"
-#include "qwt_compat.h"
+#include <qwt_plot_layout.h>
+#include <qwt_plot_zoomer.h>
+#include <qwt_symbol.h>
+#include <qwt_scale_engine.h>
+#include <qwt_compat.h>
 
 #include "colorPlot.h"
 #include "control.h"
+#include "tracker.h"
 
 using namespace std;
 
diff --git a/src/control.cpp b/src/control.cpp
index 4f92570693f2a2de2548e949f2ca021f18fc0774..e4188c6258255531396eb5cebcdcf1f82a2603c3 100644
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -38,6 +38,9 @@
 #include "view.h"
 #include "IO.h"
 #include "pMessageBox.h"
+#include "calibFilter.h"
+#include "trackingRoiItem.h"
+#include "recognitionRoiItem.h"
 
 using namespace std;
 
diff --git a/src/coordItem.cpp b/src/coordItem.cpp
index ab31bc7375b604d268612cc1b551d32b7cc117cf..c8baa4901b48f297f6b8b84661a05526d73de54d 100644
--- a/src/coordItem.cpp
+++ b/src/coordItem.cpp
@@ -18,8 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <algorithm>
-#include <math.h>
+#include <cmath>
 #include <QtWidgets>
 
 #include "petrack.h"
diff --git a/src/filter.cpp b/src/filter.cpp
index c7b03a0bd53b156553f18b64dad7d1e4a639beac..1d69d1f21b72d7d2cdc8bee4cdfc2fb5dc2ebb18 100644
--- a/src/filter.cpp
+++ b/src/filter.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "filter.h"
-#include "helper.h"
 
 using namespace::cv;
 
diff --git a/src/gridItem.cpp b/src/gridItem.cpp
index ef3a0d506281f1fdcdca594308c64eafc4056f3b..48e20074a076301fe9ff2f5eb26429cd997dd19d 100644
--- a/src/gridItem.cpp
+++ b/src/gridItem.cpp
@@ -19,8 +19,7 @@
  */
 
 #include <QtWidgets>
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
 
 #include "petrack.h"
 #include "control.h"
diff --git a/src/helper.cpp b/src/helper.cpp
index b35d18ede18bb7d3af8a6a7a87b413bf27879373..813fac980272fc381eaacb516d1dce2a2b68604b 100644
--- a/src/helper.cpp
+++ b/src/helper.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  * PeTrack - Software for tracking pedestrians movement in videos
  * Copyright (C) 2010-2020 Forschungszentrum Jülich GmbH,
  * Maik Boltes, Juliane Adrian, Ricardo Martin Brualla, Arne Graf, Paul Häger, Daniel Hillebrand,
@@ -20,8 +20,7 @@
 
 #include "helper.h"
 
-//#include <opencv.hpp>
-#include "opencv2/opencv.hpp"
+#include <opencv2/opencv.hpp>
 
 using namespace::cv;
 using namespace std;
diff --git a/src/imageItem.cpp b/src/imageItem.cpp
index 44a8a4d79d25ca5ad9ef4e208c994693b7ea54cd..7d6696e06e3f5c2b922474ce86ae4f1c863fe502 100644
--- a/src/imageItem.cpp
+++ b/src/imageItem.cpp
@@ -21,11 +21,11 @@
 #include <QGraphicsScene>
 #include <QPainter>
 #include <QGraphicsSceneHoverEvent>
+#include <cmath>
 
 #include "imageItem.h"
 #include "petrack.h"
 #include "control.h"
-#include "cmath"
 
 ImageItem::ImageItem(QWidget *wParent, QGraphicsItem * parent)
     : QGraphicsItem(parent)
diff --git a/src/logoItem.cpp b/src/logoItem.cpp
index 2f07b2230418d7c68fc76bb7eb7c973fca9fe519..cb1958bed43c02d3f396ac6b9bf85ec45b359ef2 100644
--- a/src/logoItem.cpp
+++ b/src/logoItem.cpp
@@ -26,7 +26,7 @@
 #include "logoItem.h"
 #include "petrack.h"
 
-#include <time.h>
+#include <ctime>
 
 // minimale Zeit zwischen zwei Blendenstufen in Millisekunden
 #define FRAME_INTERVAL 40
diff --git a/src/main.cpp b/src/main.cpp
index 42ca865014a0f690aff2dc36e31471642d0ae425..06e619c667572b26668b18c542242d7da7a35581 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,6 +23,7 @@
 #include <QMessageBox>
 #include <QStyleFactory>
 #include <csignal>
+#include <cstdio>
 #include <sstream>
 #include <string>
 
@@ -36,10 +37,6 @@
 // release/petrack.exe -sequence ../../einzelbilder/wert0001.png -autoSave dir|ttt.avi
 
 
-// musst be done to store fixed order of attributes in XML files
-// see: http://stackoverflow.com/questions/27378143/qt-5-produce-random-attribute-order-in-xml
-extern Q_CORE_EXPORT QBasicAtomicInt qt_qhash_seed;
-
 static QApplication * gApp = nullptr;
 void quit(int sig_number)
 {
diff --git a/src/markerCasern.cpp b/src/markerCasern.cpp
index 92adc6e35430a8b9789131f32a98b53b533e3df9..09eed200c1bb6941b6751feb0ed91c276cde6873 100644
--- a/src/markerCasern.cpp
+++ b/src/markerCasern.cpp
@@ -19,11 +19,7 @@
  */
 
 //folgende zeile spaeter raus
-#include "opencv2/highgui.hpp"
-
-// spaeter entfernen naechsten beiden zeilen
-//#include "control.h"
-//extern Control *cw;
+#include <opencv2/highgui.hpp>
 
 // fuer Aussentreppen, sehr gross, oben
 //#define HEAD_SIZE_MIN 30
diff --git a/src/markerHermes.cpp b/src/markerHermes.cpp
index 51d3696f5844ac9b24cfdf5e372c4769ebe8d154..f79efb552f9c704d49272127531e1bea04637fe8 100644
--- a/src/markerHermes.cpp
+++ b/src/markerHermes.cpp
@@ -19,7 +19,7 @@
  */
 
 //folgende zeile spaeter raus
-#include "opencv2/highgui.hpp"
+#include <opencv2/highgui.hpp>
 
 // spaeter entfernen naechsten beiden zeilen
 //#include "control.h"
diff --git a/src/markerJapan.cpp b/src/markerJapan.cpp
index 64c255728efb756b2c7de90c9567f7070aae27d9..5b42c5c27c4bf1a2acaca32d713fbe385f2a755b 100644
--- a/src/markerJapan.cpp
+++ b/src/markerJapan.cpp
@@ -19,11 +19,7 @@
  */
 
 //folgende zeile spaeter raus
-#include "opencv2/highgui.hpp"
-
-// spaeter entfernen naechsten beiden zeilen
-//#include "control.h"
-//extern Control *cw;
+#include <opencv2/highgui.hpp>
 
 //// radius fuer japan ellipsen
 //#define HEAD_SIZE_MIN 8
diff --git a/src/person.cpp b/src/person.cpp
index 5fb349941fcada9c796543dfd57f0fe8b7c5f0e3..0934a5cdee9c1397a66efb1f0690ea0172050813 100644
--- a/src/person.cpp
+++ b/src/person.cpp
@@ -20,7 +20,6 @@
 
 #include "person.h"
 #include "helper.h"
-//#include "highgui.h"
 
 //#define SHOWELLIPSES // gibt die einzelnen schritte der personen detektion pyramide graphisch aus
 //#define SAVEELLIPSES // ob alle ellips in datei geschrieben werden sollen
diff --git a/src/petrack.cpp b/src/petrack.cpp
index e81bf77204f97ac519829bcace41ae0907545b44..d6f2a220b08542fbb3724872d3dad8bd55ae69f8 100644
--- a/src/petrack.cpp
+++ b/src/petrack.cpp
@@ -49,8 +49,10 @@
 #include "backgroundItem.h"
 #include "tracker.h"
 #include "trackerReal.h"
-#include "cmath"
 #include "pMessageBox.h"
+#include "trackingRoiItem.h"
+#include "recognitionRoiItem.h"
+
 #ifdef AVI
 #include "aviFile.h"
 #else
@@ -58,13 +60,11 @@
 #endif
 #include "person.h"
 
-#include <time.h>
-
-#include <cstdlib>
-
+#include <ctime>
 #include <iomanip>
+#include <cmath>
 
-#include "opencv2/opencv.hpp"
+#include <opencv2/opencv.hpp>
 
 // Zeitausgabe aktivieren
 //#define TIME_MEASUREMENT
diff --git a/src/player.cpp b/src/player.cpp
index a3b5295aa3429ee54523d29a6bdf8e32be497193..1dc3397bef3f70fea31e327736295080ec42a1c7 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -35,8 +35,6 @@
 #include "pMessageBox.h"
 
 
-//#define TIME_MEASUREMENT
-
 Player::Player(Animation *anim, QWidget *parent) : QWidget(parent)
 {
     int size = style()->pixelMetric(QStyle::PM_ToolBarIconSize);
diff --git a/src/recognition.cpp b/src/recognition.cpp
index f6a16c6236d8c805fd702af2db87f51335867983..20b8c463c0b09d144dd79b946b4929c5ab42e039 100644
--- a/src/recognition.cpp
+++ b/src/recognition.cpp
@@ -20,25 +20,10 @@
 
 #include <QPointF>
 #include <QRect>
-#if not CV_MAJOR_VERION == 4
-#include <cv.h>
-#endif
-#include "opencv2/opencv.hpp"
+#include <opencv2/opencv.hpp>
 #include <opencv2/aruco.hpp>
 #include <bitset>
 
-//#include "imgcodecs.hpp"
-//#include "videoio.hpp"
-//#include "highgui.hpp"
-
-//#include "opencv2/highgui/highgui.hpp"
-//#include "opencv2/imgproc/imgproc.hpp"
-
-//folgende zeile spaeter raus
-//#include <highgui.h>
-
-//using namespace::cv;
-
 #include "recognition.h"
 #include "markerCasern.h"
 #include "markerHermes.h"
@@ -52,6 +37,7 @@
 #include "helper.h"
 #include "tracker.h"
 #include "control.h"
+#include "recognitionRoiItem.h"
 
 using namespace::cv;
 using namespace std;
diff --git a/src/tracker.cpp b/src/tracker.cpp
index 0bc66d5ccb4ccbe5208f09794371b6de5127dae4..c8b73fe888b01c20d8440e408c5f79b9e07002b7 100644
--- a/src/tracker.cpp
+++ b/src/tracker.cpp
@@ -18,9 +18,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "opencv2/opencv.hpp"
+#include <opencv2/opencv.hpp>
 
-#include <time.h>
+#include <ctime>
 #include <iomanip>
 
 #include "helper.h"
@@ -31,6 +31,7 @@
 #include "stereoWidget.h"
 #include "multiColorMarkerWidget.h"
 #include "pMessageBox.h"
+#include "recognitionRoiItem.h"
 
 using namespace::cv;
 using namespace std;
diff --git a/src/trackerItem.cpp b/src/trackerItem.cpp
index adde5c456de33deec2ef4758ceec5bd31d02e9c9..eef9827d6bfc3fc98be45409c370872be01c4cba 100644
--- a/src/trackerItem.cpp
+++ b/src/trackerItem.cpp
@@ -21,12 +21,14 @@
 #include <QtWidgets>
 #include <QInputDialog>
 
+#include "animation.h"
 #include "petrack.h"
 #include "control.h"
 #include "view.h"
 #include "trackerItem.h"
 #include "tracker.h"
-#include "animation.h"
+#include "recognitionRoiItem.h"
+#include "trackingRoiItem.h"
 
 using namespace::cv;
 using namespace std;
diff --git a/src/vector.cpp b/src/vector.cpp
index f0709c2551f43ebb1661134b6caf579825faf393..455d7f414eb5205fd6c58f4174012c4207ec5900 100644
--- a/src/vector.cpp
+++ b/src/vector.cpp
@@ -18,10 +18,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "opencv2/opencv.hpp"
+#include <opencv2/opencv.hpp>
 
 #include <QPointF>
-#include <QPoint>
 
 #include "vector.h"
 #include "helper.h"
diff --git a/src/view.cpp b/src/view.cpp
index 47dcc792a119b3f49a296418db92412f1b4c9284..ebc1b7b41bda1c7c3f5c649f5db9d350f16a521f 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -22,7 +22,6 @@
 
 #include <cmath>
 
-#include "helper.h"
 #include "view.h"
 #include "vector.h"
 #include "petrack.h"