diff --git a/lib/PlaYUVerDefs.h b/lib/PlaYUVerDefs.h
index 0639be6..4e7d678 100644
--- a/lib/PlaYUVerDefs.h
+++ b/lib/PlaYUVerDefs.h
@@ -80,10 +80,10 @@ typedef UChar Byte;
 // Limits definition
 // ====================================================================================================================
 
-#define MAX_UINT                    0xFFFFFFFFU ///< max. value of unsigned 32-bit integer
-#define MAX_INT                     2147483647  ///< max. value of signed 32-bit integer
-#define MAX_INT64                   0x7FFFFFFFFFFFFFFFLL  ///< max. value of signed 64-bit integer
-#define MAX_DOUBLE                  1.7e+308    ///< max. value of double-type value
+// #define MAX_UINT                    0xFFFFFFFFU ///< max. value of unsigned 32-bit integer
+// #define MAX_INT                     2147483647  ///< max. value of signed 32-bit integer
+// #define MAX_INT64                   0x7FFFFFFFFFFFFFFFLL  ///< max. value of signed 64-bit integer
+// #define MAX_DOUBLE                  1.7e+308    ///< max. value of double-type value
 
 
 // ====================================================================================================================
diff --git a/tools/PlaYUVerTools.cpp b/tools/PlaYUVerTools.cpp
index a71dfcc..a1d8a4e 100644
--- a/tools/PlaYUVerTools.cpp
+++ b/tools/PlaYUVerTools.cpp
@@ -22,6 +22,7 @@
  * \brief    Main definition of the PlaYUVerTools APp
  */
 
+#include "config.h"
 #include "PlaYUVerTools.h"
 
 #include <cstring>
@@ -29,6 +30,7 @@
 
 #include "lib/PlaYUVerPixel.h"
 #include "lib/PlaYUVerFrame.h"
+#include "lib/PlaYUVerStream.h"
 #include "lib/PlaYUVerModuleIf.h"
 #include "modules/PlaYUVerModuleFactory.h"
 
@@ -115,19 +117,17 @@ Int PlaYUVerTools::openInputs()
     }
   }
 
-  m_uiNumberOfFrames = MAX_UINT;
+  m_uiNumberOfFrames = UINT_MAX;
   if( Opts().hasOpt( "frames" ) )
   {
     m_uiNumberOfFrames = m_iFrames;
   }
 
-  m_uiNumberOfComponents = MAX_UINT;
+  m_uiNumberOfComponents = UINT_MAX;
   for( UInt i = 0; i < m_apcInputStreams.size(); i++ )
   {
-    if( m_apcInputStreams[i]->getFrameNum() < m_uiNumberOfFrames )
-      m_uiNumberOfFrames = m_apcInputStreams[i]->getFrameNum();
-    if( m_apcInputStreams[i]->getCurrFrame()->getNumberChannels() < m_uiNumberOfComponents )
-      m_uiNumberOfComponents = m_apcInputStreams[i]->getCurrFrame()->getNumberChannels();
+    m_uiNumberOfFrames = std::min( m_uiNumberOfFrames, m_apcInputStreams[i]->getFrameNum() );
+    m_uiNumberOfComponents = std::min( m_uiNumberOfComponents, m_apcInputStreams[i]->getCurrFrame()->getNumberChannels() );
   }
 
   return 0;
diff --git a/tools/PlaYUVerTools.h b/tools/PlaYUVerTools.h
index d636f31..3795098 100644
--- a/tools/PlaYUVerTools.h
+++ b/tools/PlaYUVerTools.h
@@ -25,14 +25,16 @@
 #ifndef __PLAYUVERTOOLS_H__
 #define __PLAYUVERTOOLS_H__
 
-#include "config.h"
 #include "lib/PlaYUVerDefs.h"
 #include "lib/PlaYUVerFrame.h"
-#include "lib/PlaYUVerStream.h"
+
 #include "PlaYUVerToolsCmdParser.h"
 
+class PlaYUVerFrame;
+class PlaYUVerStream;
 class PlaYUVerModuleIf;
 
+
 #define MAX_NUMBER_INPUTS 10
 
 class PlaYUVerTools: public PlaYUVerToolsCmdParser
diff --git a/tools/PlaYUVerToolsCmdParser.cpp b/tools/PlaYUVerToolsCmdParser.cpp
index 83bd08a..7c1a509 100644
--- a/tools/PlaYUVerToolsCmdParser.cpp
+++ b/tools/PlaYUVerToolsCmdParser.cpp
@@ -22,14 +22,17 @@
  * \brief    Handle for command line
  */
 
+#include "PlaYUVerToolsCmdParser.h"
+
 #include <cstring>
 #include <cstdarg>
-#include "PlaYUVerToolsCmdParser.h"
+
 #include "lib/PlaYUVerFrame.h"
 #include "lib/PlaYUVerStream.h"
 #include "lib/PlaYUVerModuleIf.h"
 #include "modules/PlaYUVerModuleFactory.h"
 
+
 PlaYUVerToolsCmdParser::PlaYUVerToolsCmdParser()
 {
   m_uiLogLevel = 0;
diff --git a/tools/PlaYUVerToolsCmdParser.h b/tools/PlaYUVerToolsCmdParser.h
index e5fb046..2b2cb77 100644
--- a/tools/PlaYUVerToolsCmdParser.h
+++ b/tools/PlaYUVerToolsCmdParser.h
@@ -29,8 +29,6 @@
 #include "lib/PlaYUVerDefs.h"
 #include "lib/PlaYUVerOptions.h"
 
-class PlaYUVerStream;
-
 class PlaYUVerToolsCmdParser
 {
 public: