diff --git a/source/app/ConfigureFormatDialog.h b/source/app/ConfigureFormatDialog.h
index 8dca1c6..7fddcce 100755
--- a/source/app/ConfigureFormatDialog.h
+++ b/source/app/ConfigureFormatDialog.h
@@ -26,7 +26,7 @@
 #define __CONFIGUREFORMATDIALOG_H__
 
 #include "config.h"
-
+#include "PlaYUVerDefs.h"
 #if( QT_VERSION_PLAYUVER == 5 )
 #include <QtWidgets>
 #elif( QT_VERSION_PLAYUVER == 4 )
@@ -34,7 +34,7 @@
 #endif
 #include <QtCore>
 
-#include "TypeDef.h"
+
 
 class QPixmap;
 class QColor;
diff --git a/source/app/DialogSubWindowSelector.cpp b/source/app/DialogSubWindowSelector.cpp
index 6db7a9a..e598676 100755
--- a/source/app/DialogSubWindowSelector.cpp
+++ b/source/app/DialogSubWindowSelector.cpp
@@ -24,8 +24,6 @@
 
 #include "DialogSubWindowSelector.h"
 #include "SubWindowHandle.h"
-//#include "PlaYUVerFrame.h"
-//#include "InputStream.h"
 
 namespace plaYUVer
 {
diff --git a/source/app/DialogSubWindowSelector.h b/source/app/DialogSubWindowSelector.h
index b7af5a2..74286c6 100755
--- a/source/app/DialogSubWindowSelector.h
+++ b/source/app/DialogSubWindowSelector.h
@@ -26,7 +26,7 @@
 #define __DIALOGSUBWINDOWSELECTOR_H__
 
 #include "config.h"
-
+#include "PlaYUVerDefs.h"
 #if( QT_VERSION_PLAYUVER == 5 )
 #include <QtWidgets>
 #elif( QT_VERSION_PLAYUVER == 4 )
@@ -34,8 +34,6 @@
 #endif
 #include <QtCore>
 
-#include "TypeDef.h"
-
 class QPixmap;
 class QColor;
 
diff --git a/source/app/GridManager.h b/source/app/GridManager.h
index 7d7172a..2a7be7b 100755
--- a/source/app/GridManager.h
+++ b/source/app/GridManager.h
@@ -26,6 +26,8 @@
 #ifndef __GRIDMANAGER_H__
 #define __GRIDMANAGER_H__
 
+#include "config.h"
+#include "PlaYUVerDefs.h"
 #include <QRect>
 #include <QColor>
 #include <QPen>
diff --git a/source/app/HistogramWidget.cpp b/source/app/HistogramWidget.cpp
index f7ea10d..42c1f91 100755
--- a/source/app/HistogramWidget.cpp
+++ b/source/app/HistogramWidget.cpp
@@ -25,11 +25,13 @@
 
 //TODO:
 //      - Optimizar paintEvent. Parece haver codigo redundante  !! 
+
+#include "config.h"
+#include "PlaYUVerDefs.h"
 #include <cmath>
 #include <QtGui>
 #include <QtDebug>
 #include "HistogramWidget.h"
-#include "TypeDef.h"
 #include "PlaYUVerFrameStatistics.h"
 #include "PlaYUVerFrame.h"
 
diff --git a/source/app/HistogramWidget.h b/source/app/HistogramWidget.h
index b270f74..866939f 100755
--- a/source/app/HistogramWidget.h
+++ b/source/app/HistogramWidget.h
@@ -27,10 +27,9 @@
 #define __HISTOGRAMWIDGET_H__
 
 #include "config.h"
-
+#include "PlaYUVerDefs.h"
 #include <QWidget>
 #include <QColor>
-#include "TypeDef.h"
 #include "PlaYUVerFrame.h"
 #include "PlaYUVerFrameStatistics.h"
 
diff --git a/source/app/InputStream.h b/source/app/InputStream.h
index 5b4a0c8..721f99e 100755
--- a/source/app/InputStream.h
+++ b/source/app/InputStream.h
@@ -26,13 +26,11 @@
 #define __INPUTSTREAM_H__
 
 #include "config.h"
-
+#include "PlaYUVerDefs.h"
 #include <iostream>
 #include <cstdio>
-
 #include <QtCore>
 #include <QtGui>
-
 #ifdef USE_OPENCV
 #include <opencv2/opencv.hpp>
 #endif
@@ -40,9 +38,6 @@
 #ifdef USE_FFMPEG
 #include "LibAvContextHandle.h"
 #endif
-
-#include "TypeDef.h"
-
 #include "PlaYUVerFrame.h"
 
 namespace plaYUVer
diff --git a/source/app/ModulesHandle.h b/source/app/ModulesHandle.h
index ca19ffd..d22e032 100644
--- a/source/app/ModulesHandle.h
+++ b/source/app/ModulesHandle.h
@@ -25,6 +25,7 @@
 #define __MODULESHANDLE_H__
 
 #include "config.h"
+#include "PlaYUVerDefs.h"
 
 #include <iostream>
 #include <cstdio>
@@ -36,7 +37,6 @@
 #include <QtGui>
 #endif
 
-#include "TypeDef.h"
 #include "PlaYUVerModuleIf.h"
 
 namespace plaYUVer
diff --git a/source/app/PlaYUVerModuleIf.h b/source/app/PlaYUVerModuleIf.h
index 7e55663..28ceb52 100644
--- a/source/app/PlaYUVerModuleIf.h
+++ b/source/app/PlaYUVerModuleIf.h
@@ -26,11 +26,9 @@
 #define __PLAYUVERMODULESIF_H__
 
 #include "config.h"
-
+#include "PlaYUVerDefs.h"
 #include <iostream>
 #include <cstdio>
-
-#include "TypeDef.h"
 #include "PlaYUVerFrame.h"
 
 class QImage;
diff --git a/source/app/PlaYUVerSettings.h b/source/app/PlaYUVerSettings.h
index 23a7da2..8740453 100755
--- a/source/app/PlaYUVerSettings.h
+++ b/source/app/PlaYUVerSettings.h
@@ -26,9 +26,8 @@
 #define __PLAYUVERSETTINGS_H__
 
 #include "config.h"
-
+#include "PlaYUVerDefs.h"
 #include <QtCore>
-#include "TypeDef.h"
 #include "GridManager.h"
 
 namespace plaYUVer
diff --git a/source/app/PropertiesSidebar.cpp b/source/app/PropertiesSidebar.cpp
index 9ceafeb..98214b8 100755
--- a/source/app/PropertiesSidebar.cpp
+++ b/source/app/PropertiesSidebar.cpp
@@ -23,10 +23,10 @@
  */
 
 #include "config.h"
+#include "PlaYUVerDefs.h"
 #include <cmath>
 #include <QtGui>
 #include <QtDebug>
-#include "TypeDef.h"
 #include "PropertiesSidebar.h"
 
 namespace plaYUVer
diff --git a/source/app/PropertiesSidebar.h b/source/app/PropertiesSidebar.h
index f35e5c5..ce87697 100755
--- a/source/app/PropertiesSidebar.h
+++ b/source/app/PropertiesSidebar.h
@@ -25,6 +25,8 @@
 #ifndef __PROPERTIESSIDEBAR_H__
 #define __PROPERTIESSIDEBAR_H__
 
+#include "config.h"
+#include "PlaYUVerDefs.h"
 #if( QT_VERSION_PLAYUVER == 5 )
 #include <QtWidgets>
 #elif( QT_VERSION_PLAYUVER == 4 )
diff --git a/source/app/SubWindowHandle.h b/source/app/SubWindowHandle.h
index 7183724..93b2fa5 100644
--- a/source/app/SubWindowHandle.h
+++ b/source/app/SubWindowHandle.h
@@ -26,14 +26,12 @@
 #define __SUBWINDOWHANDLE_H__
 
 #include "config.h"
-
+#include "PlaYUVerDefs.h"
 #if( QT_VERSION_PLAYUVER == 5 )
 #include <QtWidgets>
 #elif( QT_VERSION_PLAYUVER == 4 )
 #include <QtGui>
 #endif
-
-#include "TypeDef.h"
 #include "InputStream.h"
 #include "ViewArea.h"
 #include "ModulesHandle.h"
diff --git a/source/app/ViewArea.h b/source/app/ViewArea.h
index 46d1023..af31821 100755
--- a/source/app/ViewArea.h
+++ b/source/app/ViewArea.h
@@ -26,12 +26,12 @@
 #ifndef __VIEWAREA_H__
 #define __VIEWAREA_H__
 
+#include "config.h"
+#include "PlaYUVerDefs.h"
 #include <QWidget>
 #include <QPixmap>
 #include <QBitmap>
 #include <QColor>
-
-#include "TypeDef.h"
 #include "GridManager.h"
 #include "PlaYUVerFrame.h"
 
diff --git a/source/app/plaYUVerApp.h b/source/app/plaYUVerApp.h
index 7cfd846..e61aa0c 100644
--- a/source/app/plaYUVerApp.h
+++ b/source/app/plaYUVerApp.h
@@ -26,15 +26,13 @@
 #define __PLAYUVERAPP_H__
 
 #include "config.h"
-
+#include "PlaYUVerDefs.h"
 #if( QT_VERSION_PLAYUVER == 5 )
 #include <QtWidgets>
 #elif( QT_VERSION_PLAYUVER == 4 )
 #include <QtGui>
 #endif
 #include <QMainWindow>
-#include "TypeDef.h"
-
 #include "ModulesHandle.h"
 #include "PropertiesSidebar.h"
 
diff --git a/source/lib/LibMemAlloc.h b/source/lib/LibMemAlloc.h
index cfd778e..c787a63 100644
--- a/source/lib/LibMemAlloc.h
+++ b/source/lib/LibMemAlloc.h
@@ -26,10 +26,9 @@
 #define __LIBMEMALLOC_H__
 
 #include "config.h"
-
+#include "PlaYUVerDefs.h"
 #include <cstdlib>
 #include <cstring>
-#include "TypeDef.h"
 
 namespace plaYUVer
 {
diff --git a/source/app/TypeDef.h b/source/lib/PlaYUVerDefs.h
similarity index 100%
rename from source/app/TypeDef.h
rename to source/lib/PlaYUVerDefs.h
diff --git a/source/lib/PlaYUVerFrame.h b/source/lib/PlaYUVerFrame.h
index 2105d61..4562b68 100755
--- a/source/lib/PlaYUVerFrame.h
+++ b/source/lib/PlaYUVerFrame.h
@@ -26,7 +26,7 @@
 #define __PLAYUVERFRAME_H__
 
 #include "config.h"
-
+#include "PlaYUVerDefs.h"
 #include <iostream>
 #include <cstdio>
 #include <cassert>
@@ -37,7 +37,6 @@
 #ifdef USE_PIXFC
 #include "pixfc-sse.h"
 #endif
-#include "TypeDef.h"
 
 class QImage;
 
diff --git a/source/lib/PlaYUVerFrameStatistics.h b/source/lib/PlaYUVerFrameStatistics.h
index d030d2d..00942eb 100755
--- a/source/lib/PlaYUVerFrameStatistics.h
+++ b/source/lib/PlaYUVerFrameStatistics.h
@@ -26,10 +26,8 @@
 #ifndef __PLAYUVERFRAMESTATISTICS_H_
 #define __PLAYUVERFRAMESTATISTICS_H_
 
-#include "config.h"
-
+#include "PlaYUVerDefs.h"
 #include <QThread>
-#include "TypeDef.h"
 #include "PlaYUVerFrame.h"
 
 class QObject;
diff --git a/source/lib/ffmpeg/LibAvContextHandle.h b/source/lib/ffmpeg/LibAvContextHandle.h
index 10e84d8..dcdc947 100755
--- a/source/lib/ffmpeg/LibAvContextHandle.h
+++ b/source/lib/ffmpeg/LibAvContextHandle.h
@@ -44,7 +44,7 @@ extern "C"
 #include <libavformat/avformat.h>
 }
 
-#include "TypeDef.h"
+#include "PlaYUVerDefs.h"
 
 namespace plaYUVer
 {
diff --git a/source/modules/DisparityStereoVar.h b/source/modules/DisparityStereoVar.h
index 2bc618e..89e903b 100644
--- a/source/modules/DisparityStereoVar.h
+++ b/source/modules/DisparityStereoVar.h
@@ -26,10 +26,9 @@
 #define __DISPARITYSTEREOVAR_H__
 
 #include "config.h"
-
+#include "PlaYUVerDefs.h"
 #include <iostream>
 #include <cstdio>
-#include "TypeDef.h"
 #include "PlaYUVerFrame.h"
 #include "PlaYUVerModuleIf.h"
 #include <opencv2/opencv.hpp>
diff --git a/source/modules/FilterFrame.h b/source/modules/FilterFrame.h
index b1157be..6adc14f 100644
--- a/source/modules/FilterFrame.h
+++ b/source/modules/FilterFrame.h
@@ -26,10 +26,9 @@
 #define __FILTERFRAME_H__
 
 #include "config.h"
-
+#include "PlaYUVerDefs.h"
 #include <iostream>
 #include <cstdio>
-#include "TypeDef.h"
 #include "PlaYUVerFrame.h"
 #include "PlaYUVerModuleIf.h"
 
diff --git a/source/modules/FrameDifference.h b/source/modules/FrameDifference.h
index a3447b7..81968a0 100644
--- a/source/modules/FrameDifference.h
+++ b/source/modules/FrameDifference.h
@@ -26,10 +26,9 @@
 #define __MEASUREPSNR_H__
 
 #include "config.h"
-
+#include "PlaYUVerDefs.h"
 #include <iostream>
 #include <cstdio>
-#include "TypeDef.h"
 #include "PlaYUVerFrame.h"
 #include "PlaYUVerModuleIf.h"