diff --git a/lib/PlaYUVerDefs.h b/lib/PlaYUVerDefs.h
index 09a2a44..0639be6 100644
--- a/lib/PlaYUVerDefs.h
+++ b/lib/PlaYUVerDefs.h
@@ -26,8 +26,6 @@
 #ifndef __PLAYUVERDEFS_H__
 #define __PLAYUVERDEFS_H__
 
-#include <string>
-#include <vector>
 #include <algorithm>
 
 // ====================================================================================================================
@@ -87,9 +85,6 @@ typedef UChar Byte;
 #define MAX_INT64                   0x7FFFFFFFFFFFFFFFLL  ///< max. value of signed 64-bit integer
 #define MAX_DOUBLE                  1.7e+308    ///< max. value of double-type value
 
-// ====================================================================================================================
-// Macro functions
-// ====================================================================================================================
 
 // ====================================================================================================================
 // PlaYUVer definitions
diff --git a/lib/PlaYUVerModuleIf.h b/lib/PlaYUVerModuleIf.h
index 439fea4..725054c 100644
--- a/lib/PlaYUVerModuleIf.h
+++ b/lib/PlaYUVerModuleIf.h
@@ -38,7 +38,6 @@
 #include "PlaYUVerDefs.h"
 #include "PlaYUVerFrame.h"
 #include "PlaYUVerOptions.h"
-#include <vector>
 
 #define REGISTER_CLASS_MAKER(X) \
   extern "C" PlaYUVerModuleIf* Maker() { return new X; }
diff --git a/lib/PlaYUVerOptions.cpp b/lib/PlaYUVerOptions.cpp
index 729ca56..550fa6b 100644
--- a/lib/PlaYUVerOptions.cpp
+++ b/lib/PlaYUVerOptions.cpp
@@ -39,16 +39,8 @@
 #include "config.h"
 #include "PlaYUVerOptions.h"
 
-#include <stdlib.h>
-#include <iostream>
-#include <fstream>
 #include <sstream>
-#include <string>
 #include <cstring>
-#include <cstdarg>
-#include <list>
-#include <map>
-#include <algorithm>
 
 #include "lib/PlaYUVerModuleIf.h"
 #include "modules/PlaYUVerModuleFactory.h"
diff --git a/lib/PlaYUVerOptions.h b/lib/PlaYUVerOptions.h
index 795f2b1..c6118d7 100644
--- a/lib/PlaYUVerOptions.h
+++ b/lib/PlaYUVerOptions.h
@@ -39,12 +39,8 @@
 #ifndef __PROGRAMOPTIONS_H__
 #define __PROGRAMOPTIONS_H__
 
-#include <iostream>
-#include <sstream>
-#include <string>
 #include <list>
 #include <map>
-#include <vector>
 
 #include "PlaYUVerDefs.h"
 
diff --git a/lib/PlaYUVerStream.cpp b/lib/PlaYUVerStream.cpp
index 73abf94..efcb150 100644
--- a/lib/PlaYUVerStream.cpp
+++ b/lib/PlaYUVerStream.cpp
@@ -22,12 +22,16 @@
  * \brief    Input stream handling
  */
 
+// Self
 #include "config.h"
 #include "PlaYUVerStream.h"
 
+// System
 #include <cstdio>
 
+// Own
 #include "LibMemory.h"
+#include "PlaYUVerFrame.h"
 #include "PlaYUVerStreamHandlerIf.h"
 #include "StreamHandlerRaw.h"
 #include "StreamHandlerPortableMap.h"
@@ -38,6 +42,7 @@
 #include "StreamHandlerOpenCV.h"
 #endif
 
+
 std::vector<PlaYUVerSupportedFormat> PlaYUVerStream::supportedReadFormats()
 {
   INI_REGIST_PLAYUVER_SUPPORTED_FMT;
diff --git a/lib/PlaYUVerStream.h b/lib/PlaYUVerStream.h
index fbefab8..32fc8c5 100644
--- a/lib/PlaYUVerStream.h
+++ b/lib/PlaYUVerStream.h
@@ -26,8 +26,8 @@
 #define __PLAYUVERSTREAM_H__
 
 #include "PlaYUVerDefs.h"
-#include "PlaYUVerFrame.h"
 
+class PlaYUVerFrame;
 class PlaYUVerStreamHandlerIf;
 
 typedef struct
diff --git a/lib/PlaYUVerStreamHandlerIf.h b/lib/PlaYUVerStreamHandlerIf.h
index 0f4ae59..e886c12 100644
--- a/lib/PlaYUVerStreamHandlerIf.h
+++ b/lib/PlaYUVerStreamHandlerIf.h
@@ -27,7 +27,8 @@
 
 #include "PlaYUVerDefs.h"
 #include "PlaYUVerStream.h"
-#include "PlaYUVerFrame.h"
+
+class PlaYUVerFrame;
 
 #define REGISTER_STREAM_HANDLER(X) \
   public: \
diff --git a/lib/StreamHandlerOpenCV.cpp b/lib/StreamHandlerOpenCV.cpp
index 5195971..126da05 100644
--- a/lib/StreamHandlerOpenCV.cpp
+++ b/lib/StreamHandlerOpenCV.cpp
@@ -22,8 +22,14 @@
  * \brief    Interface with opencv lib
  */
 
-#include <cstdio>
+// Self
 #include "StreamHandlerOpenCV.h"
+
+// System
+#include <cstdio>
+#include <opencv2/opencv.hpp>
+
+// Own
 #include "PlaYUVerFrame.h"
 #include "PlaYUVerFramePixelFormats.h"
 #include "LibMemory.h"
diff --git a/lib/StreamHandlerOpenCV.h b/lib/StreamHandlerOpenCV.h
index aa02b0f..022ae8d 100644
--- a/lib/StreamHandlerOpenCV.h
+++ b/lib/StreamHandlerOpenCV.h
@@ -25,10 +25,7 @@
 #ifndef __STREAMHANDLEROPENCV_H__
 #define __STREAMHANDLEROPENCV_H__
 
-#include <inttypes.h>
-#include <vector>
-#include <string>
-#include <opencv2/opencv.hpp>
+
 #include "PlaYUVerDefs.h"
 #include "PlaYUVerStreamHandlerIf.h"
 
diff --git a/lib/StreamHandlerPortableMap.h b/lib/StreamHandlerPortableMap.h
index f762f4c..7434f69 100644
--- a/lib/StreamHandlerPortableMap.h
+++ b/lib/StreamHandlerPortableMap.h
@@ -25,11 +25,7 @@
 #ifndef __STREAMHANDLERPORTABLEMAP_H__
 #define __STREAMHANDLERPORTABLEMAP_H__
 
-#include <inttypes.h>
-#include <vector>
-#include <string>
 #include "PlaYUVerDefs.h"
-#include "PlaYUVerStream.h"
 #include "PlaYUVerStreamHandlerIf.h"
 
 class PlaYUVerFrame;
diff --git a/lib/StreamHandlerRaw.cpp b/lib/StreamHandlerRaw.cpp
index e84d3d6..02f5d87 100644
--- a/lib/StreamHandlerRaw.cpp
+++ b/lib/StreamHandlerRaw.cpp
@@ -22,11 +22,14 @@
  * \brief    Interface for raw (yuv) streams
  */
 
-#include <cstdio>
 #include "StreamHandlerRaw.h"
+
+#include <cstdio>
+
+#include "LibMemory.h"
 #include "PlaYUVerFrame.h"
 #include "PlaYUVerFramePixelFormats.h"
-#include "LibMemory.h"
+
 
 Bool StreamHandlerRaw::openHandler( String strFilename, Bool bInput )
 {
diff --git a/modules/AbsoluteFrameDifference.cpp b/modules/AbsoluteFrameDifference.cpp
index 985c7c0..7ccd587 100644
--- a/modules/AbsoluteFrameDifference.cpp
+++ b/modules/AbsoluteFrameDifference.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "AbsoluteFrameDifference.h"
-#include <cstdlib>
+
 
 AbsoluteFrameDifference::AbsoluteFrameDifference()
 {
diff --git a/modules/AbsoluteFrameDifference.h b/modules/AbsoluteFrameDifference.h
index e4956e4..e13202a 100644
--- a/modules/AbsoluteFrameDifference.h
+++ b/modules/AbsoluteFrameDifference.h
@@ -25,9 +25,9 @@
 #ifndef __ABSOLUTEFRAMEDIFFERENCE_H__
 #define __ABSOLUTEFRAMEDIFFERENCE_H__
 
+// PlaYUVerLib
 #include "lib/PlaYUVerModuleIf.h"
 
-#include <cassert>
 
 class AbsoluteFrameDifference: public PlaYUVerModuleIf
 {
diff --git a/modules/DisparityStereoBM.cpp b/modules/DisparityStereoBM.cpp
index 506eb61..3b6f5e0 100644
--- a/modules/DisparityStereoBM.cpp
+++ b/modules/DisparityStereoBM.cpp
@@ -22,8 +22,6 @@
  * \brief    Measure the disparity between two images using the Stereo Var method (OpenCV)
  */
 
-#include <cstdio>
-
 #include "DisparityStereoBM.h"
 
 DisparityStereoBM::DisparityStereoBM()
diff --git a/modules/DisparityStereoBM.h b/modules/DisparityStereoBM.h
index 7f851b4..fd6fb91 100644
--- a/modules/DisparityStereoBM.h
+++ b/modules/DisparityStereoBM.h
@@ -25,11 +25,12 @@
 #ifndef __DISPARITYSTEREOBM_H__
 #define __DISPARITYSTEREOBM_H__
 
-#include <iostream>
-#include "lib/PlaYUVerModuleIf.h"
+// OpenCV
 #include <opencv2/opencv.hpp>
 
-#include <cassert>
+// PlaYUVerLib
+#include "lib/PlaYUVerModuleIf.h"
+
 
 class DisparityStereoBM: public PlaYUVerModuleIf
 {
diff --git a/modules/DisparityStereoSGBM.cpp b/modules/DisparityStereoSGBM.cpp
index ae2b562..a6aa542 100644
--- a/modules/DisparityStereoSGBM.cpp
+++ b/modules/DisparityStereoSGBM.cpp
@@ -22,8 +22,6 @@
  * \brief    Measure the disparity between two images using the SGBM method (OpenCV)
  */
 
-#include <cstdio>
-
 #include "DisparityStereoSGBM.h"
 
 DisparityStereoSGBM::DisparityStereoSGBM()
diff --git a/modules/DisparityStereoSGBM.h b/modules/DisparityStereoSGBM.h
index 394208a..51cd170 100644
--- a/modules/DisparityStereoSGBM.h
+++ b/modules/DisparityStereoSGBM.h
@@ -37,11 +37,12 @@
 #ifndef __DISPARITYSTEREOSGBM_H__
 #define __DISPARITYSTEREOSGBM_H__
 
-#include <iostream>
-#include "lib/PlaYUVerModuleIf.h"
+// OpenCV
 #include <opencv2/opencv.hpp>
 
-#include <cassert>
+// PlaYUVerLib
+#include "lib/PlaYUVerModuleIf.h"
+
 
 class DisparityStereoSGBM: public PlaYUVerModuleIf
 {
diff --git a/modules/DisparityStereoVar.cpp b/modules/DisparityStereoVar.cpp
index a6052d5..15144d5 100644
--- a/modules/DisparityStereoVar.cpp
+++ b/modules/DisparityStereoVar.cpp
@@ -22,8 +22,6 @@
  * \brief    Measure the disparity between two images using the Stereo Var method (OpenCV)
  */
 
-#include <cstdio>
-
 #include "DisparityStereoVar.h"
 
 DisparityStereoVar::DisparityStereoVar()
diff --git a/modules/DisparityStereoVar.h b/modules/DisparityStereoVar.h
index 68cb490..0bd9bce 100644
--- a/modules/DisparityStereoVar.h
+++ b/modules/DisparityStereoVar.h
@@ -25,11 +25,12 @@
 #ifndef __DISPARITYSTEREOVAR_H__
 #define __DISPARITYSTEREOVAR_H__
 
-#include <iostream>
-#include "PlaYUVerModuleIf.h"
+// OpenCV
 #include <opencv2/opencv.hpp>
 
-#include <cassert>
+// PlaYUVerLib
+#include "PlaYUVerModuleIf.h"
+
 
 class DisparityStereoVar: public PlaYUVerModuleIf
 {
diff --git a/modules/EightBitsSampling.cpp b/modules/EightBitsSampling.cpp
index 938f81c..ce6d766 100644
--- a/modules/EightBitsSampling.cpp
+++ b/modules/EightBitsSampling.cpp
@@ -24,6 +24,7 @@
 
 #include "EightBitsSampling.h"
 
+
 EightBitsSampling::EightBitsSampling()
 {
   /* Module Definition */
diff --git a/modules/EightBitsSampling.h b/modules/EightBitsSampling.h
index 8adb69c..4402a1c 100644
--- a/modules/EightBitsSampling.h
+++ b/modules/EightBitsSampling.h
@@ -25,8 +25,10 @@
 #ifndef __EIGHTBITSSAMPLING_H__
 #define __EIGHTBITSSAMPLING_H__
 
+// PlaYUVerLib
 #include "lib/PlaYUVerModuleIf.h"
 
+
 class EightBitsSampling: public PlaYUVerModuleIf
 {
 REGISTER_CLASS_FACTORY( EightBitsSampling )
diff --git a/modules/FilterComponent.cpp b/modules/FilterComponent.cpp
index 05dc32e..c0378f5 100644
--- a/modules/FilterComponent.cpp
+++ b/modules/FilterComponent.cpp
@@ -22,10 +22,10 @@
  * \brief    Filter component frame module
  */
 
-#include <cstdio>
-#include <cstring>
 #include "FilterComponent.h"
 
+#include <cstring>
+
 FilterComponentModule::FilterComponentModule()
 {
   m_pcFilteredFrame = NULL;
diff --git a/modules/FilterComponent.h b/modules/FilterComponent.h
index f9b86a6..4744763 100644
--- a/modules/FilterComponent.h
+++ b/modules/FilterComponent.h
@@ -25,8 +25,10 @@
 #ifndef __FILTERCOMPONENT_H__
 #define __FILTERCOMPONENT_H__
 
+// PlaYUVerLib
 #include "lib/PlaYUVerModuleIf.h"
 
+
 class FilterComponentModule: public PlaYUVerModuleIf
 {
 private:
diff --git a/modules/FrameBinarization.cpp b/modules/FrameBinarization.cpp
index 5ea8d58..fd7f7c5 100644
--- a/modules/FrameBinarization.cpp
+++ b/modules/FrameBinarization.cpp
@@ -24,6 +24,7 @@
 
 #include "FrameBinarization.h"
 
+
 FrameBinarization::FrameBinarization()
 {
   /* Module Definition */
diff --git a/modules/FrameBinarization.h b/modules/FrameBinarization.h
index 4b53a0a..2b346c2 100644
--- a/modules/FrameBinarization.h
+++ b/modules/FrameBinarization.h
@@ -25,8 +25,10 @@
 #ifndef __FRAMEBINARIZATION_H__
 #define __FRAMEBINARIZATION_H__
 
+// PlaYUVerLib
 #include "lib/PlaYUVerModuleIf.h"
 
+
 class FrameBinarization: public PlaYUVerModuleIf
 {
 REGISTER_CLASS_FACTORY( FrameBinarization )
diff --git a/modules/FrameCrop.cpp b/modules/FrameCrop.cpp
index 82f8082..e758ef4 100644
--- a/modules/FrameCrop.cpp
+++ b/modules/FrameCrop.cpp
@@ -24,6 +24,7 @@
 
 #include "FrameCrop.h"
 
+
 FrameCrop::FrameCrop()
 {
   /* Module Definition */
diff --git a/modules/FrameCrop.h b/modules/FrameCrop.h
index f0d859a..f429bd2 100644
--- a/modules/FrameCrop.h
+++ b/modules/FrameCrop.h
@@ -25,8 +25,10 @@
 #ifndef __FRAMECROP_H__
 #define __FRAMECROP_H__
 
+// PlaYUVerLib
 #include "lib/PlaYUVerModuleIf.h"
 
+
 class FrameCrop: public PlaYUVerModuleIf
 {
 REGISTER_CLASS_FACTORY( FrameCrop )
diff --git a/modules/FrameDifference.cpp b/modules/FrameDifference.cpp
index bbfefde..0ef9712 100644
--- a/modules/FrameDifference.cpp
+++ b/modules/FrameDifference.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "FrameDifference.h"
-#include <algorithm>
+
 
 FrameDifference::FrameDifference()
 {
diff --git a/modules/FrameDifference.h b/modules/FrameDifference.h
index da43c63..8a388b0 100644
--- a/modules/FrameDifference.h
+++ b/modules/FrameDifference.h
@@ -25,9 +25,9 @@
 #ifndef __FRAMEDIFFERENCE_H__
 #define __FRAMEDIFFERENCE_H__
 
+// PlaYUVerLib
 #include "lib/PlaYUVerModuleIf.h"
 
-#include <cassert>
 
 class FrameDifference: public PlaYUVerModuleIf
 {
diff --git a/modules/FrameMask.cpp b/modules/FrameMask.cpp
index f5f6f7e..2a92fbd 100644
--- a/modules/FrameMask.cpp
+++ b/modules/FrameMask.cpp
@@ -23,8 +23,7 @@
  */
 
 #include "FrameMask.h"
-#include <algorithm>
-class be;
+
 
 FrameMask::FrameMask()
 {
diff --git a/modules/FrameMask.h b/modules/FrameMask.h
index 09d0430..baf2cdf 100644
--- a/modules/FrameMask.h
+++ b/modules/FrameMask.h
@@ -25,9 +25,9 @@
 #ifndef __FRAMEMASK_H__
 #define __FRAMEMASK_H__
 
+// PlaYUVerLib
 #include "lib/PlaYUVerModuleIf.h"
 
-#include <cassert>
 
 class FrameMask: public PlaYUVerModuleIf
 {
diff --git a/modules/FrameShift.cpp b/modules/FrameShift.cpp
index ea7b495..0c098f4 100644
--- a/modules/FrameShift.cpp
+++ b/modules/FrameShift.cpp
@@ -24,6 +24,7 @@
 
 #include "FrameShift.h"
 
+
 FrameShift::FrameShift()
 {
   /* Module Definition */
diff --git a/modules/FrameShift.h b/modules/FrameShift.h
index 758c972..78e86a2 100644
--- a/modules/FrameShift.h
+++ b/modules/FrameShift.h
@@ -25,8 +25,10 @@
 #ifndef __FRAMESHIFT_H__
 #define __FRAMESHIFT_H__
 
+// PlaYUVerLib
 #include "lib/PlaYUVerModuleIf.h"
 
+
 class FrameShift: public PlaYUVerModuleIf
 {
 REGISTER_CLASS_FACTORY( FrameShift )
diff --git a/modules/LumaAverage.cpp b/modules/LumaAverage.cpp
index 22dcf68..5e1d531 100644
--- a/modules/LumaAverage.cpp
+++ b/modules/LumaAverage.cpp
@@ -24,6 +24,7 @@
 
 #include "LumaAverage.h"
 
+
 LumaAverage::LumaAverage()
 {
   /* Module Definition */
diff --git a/modules/LumaAverage.h b/modules/LumaAverage.h
index 4b51482..be46dd4 100644
--- a/modules/LumaAverage.h
+++ b/modules/LumaAverage.h
@@ -25,8 +25,10 @@
 #ifndef __LUMAAVERAGE_H__
 #define __LUMAAVERAGE_H__
 
+// PlaYUVerLib
 #include "lib/PlaYUVerModuleIf.h"
 
+
 class LumaAverage: public PlaYUVerModuleIf
 {
 REGISTER_CLASS_FACTORY( LumaAverage )
diff --git a/modules/MeasureOpticalFlowDualTVL1.cpp b/modules/MeasureOpticalFlowDualTVL1.cpp
index 139aa4b..a18b28a 100644
--- a/modules/MeasureOpticalFlowDualTVL1.cpp
+++ b/modules/MeasureOpticalFlowDualTVL1.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "MeasureOpticalFlowDualTVL1.h"
-#include <cstdlib>
 
 using cv::Scalar;
 using cv::Mat;
diff --git a/modules/MeasureOpticalFlowDualTVL1.h b/modules/MeasureOpticalFlowDualTVL1.h
index 3692b0f..282f3ba 100644
--- a/modules/MeasureOpticalFlowDualTVL1.h
+++ b/modules/MeasureOpticalFlowDualTVL1.h
@@ -28,8 +28,10 @@
 #include <opencv2/core/core.hpp>
 #include <opencv2/video/video.hpp>
 
+// PlaYUVerLib
 #include "lib/PlaYUVerModuleIf.h"
 
+
 class MeasureOpticalFlowDualTVL1: public PlaYUVerModuleIf
 {
 REGISTER_CLASS_FACTORY( MeasureOpticalFlowDualTVL1 )
diff --git a/modules/OpticalFlow.h b/modules/OpticalFlow.h
index de739a6..4df33d5 100644
--- a/modules/OpticalFlow.h
+++ b/modules/OpticalFlow.h
@@ -32,6 +32,7 @@
 // PlaYUVerLib
 #include "lib/PlaYUVerModuleIf.h"
 
+
 class OpticalFlowModule: public PlaYUVerModuleIf
 {
 protected:
@@ -77,6 +78,7 @@ public:
   Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
 };
 
+
 class OpticalFlowFarneback: public OpticalFlowModule
 {
   REGISTER_CLASS_FACTORY( OpticalFlowFarneback )
diff --git a/modules/PlaYUVerModuleFactory.cpp b/modules/PlaYUVerModuleFactory.cpp
index d80827d..30ab8f3 100644
--- a/modules/PlaYUVerModuleFactory.cpp
+++ b/modules/PlaYUVerModuleFactory.cpp
@@ -23,14 +23,18 @@
  */
 
 #include "config.h"
+#include "PlaYUVerModuleFactory.h"
+
 #include <functional>
 #include <cstring>
 #ifdef USE_DYNLOAD
 #include <dlfcn.h>
 #endif
-#include "PlaYUVerModuleFactory.h"
+
+// Generated by cmake
 #include "ModulesListHeader.h"
 
+
 PlaYUVerModuleFactory::PlaYUVerModuleFactory()
 {
   REGISTER_ALL_MODULES
diff --git a/modules/PlaYUVerModuleFactory.h b/modules/PlaYUVerModuleFactory.h
index 83bbe94..daee368 100644
--- a/modules/PlaYUVerModuleFactory.h
+++ b/modules/PlaYUVerModuleFactory.h
@@ -25,8 +25,9 @@
 #ifndef __PLAYUVERMODULESFACTORY_H__
 #define __PLAYUVERMODULESFACTORY_H__
 
-#include <functional>
 #include <map>
+
+// PlaYUVerLib
 #include "lib/PlaYUVerModuleIf.h"
 
 #define REGISTER_MODULE(X) Register( "X", &(X::Create) );
diff --git a/modules/SetChromaHalfScale.cpp b/modules/SetChromaHalfScale.cpp
index ae52b76..539bbb6 100644
--- a/modules/SetChromaHalfScale.cpp
+++ b/modules/SetChromaHalfScale.cpp
@@ -19,7 +19,7 @@
 
 /**
  * \file     SetChromaHalfScale.cpp
- * \brief    Binarize frame module
+ * \brief    Set chrome value to half scale (gray)
  */
 
 #include "SetChromaHalfScale.h"
diff --git a/modules/SetChromaHalfScale.h b/modules/SetChromaHalfScale.h
index bcf16ea..9c865c5 100644
--- a/modules/SetChromaHalfScale.h
+++ b/modules/SetChromaHalfScale.h
@@ -19,12 +19,13 @@
 
 /**
  * \file     SetChromaHalfScale.h
- * \brief    Binarize frame module
+ * \brief    Set chrome value to half scale (gray)
  */
 
-#ifndef __CHROMA128_H__
-#define __CHROMA128_H__
+#ifndef _SETCHROMAHALFSCALE_H_
+#define _SETCHROMAHALFSCALE_H_
 
+// PlaYUVerLib
 #include "lib/PlaYUVerModuleIf.h"
 
 class SetChromaHalfScale: public PlaYUVerModuleIf
@@ -44,5 +45,5 @@ private:
 
 };
 
-#endif // __CHROMA128_H__
+#endif // _SETCHROMAHALFSCALE_H_
 
diff --git a/modules/WeightedPSNR.cpp b/modules/WeightedPSNR.cpp
index 5c75e9f..47076da 100644
--- a/modules/WeightedPSNR.cpp
+++ b/modules/WeightedPSNR.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "WeightedPSNR.h"
-#include <algorithm>
-#include <cmath>
 
 WeightedPSNR::WeightedPSNR()
 {
diff --git a/modules/WeightedPSNR.h b/modules/WeightedPSNR.h
index c9743ca..c420e2b 100644
--- a/modules/WeightedPSNR.h
+++ b/modules/WeightedPSNR.h
@@ -25,10 +25,9 @@
 #ifndef __WEIGHTEDPSNR_H__
 #define __WEIGHTEDPSNR_H__
 
+// PlaYUVerLib
 #include "lib/PlaYUVerModuleIf.h"
 
-#include <cassert>
-
 class WeightedPSNR: public PlaYUVerModuleIf
 {
 REGISTER_CLASS_FACTORY( WeightedPSNR )