diff --git a/src/src/IO/DICOM/DicomLoader.h b/src/src/IO/DICOM/DicomLoader.h
index a7aa0b6..8b92fb9 100644
--- a/src/src/IO/DICOM/DicomLoader.h
+++ b/src/src/IO/DICOM/DicomLoader.h
@@ -1,5 +1,8 @@
+#ifndef OMEGAV_DICOMLOADER_H
+#define OMEGAV_DICOMLOADER_H
+
 #pragma once
-#include "global/include_all.h"
+
 #include "global/include_vitk.h"
 
 using namespace std;
@@ -71,3 +74,5 @@ private:
     vtkObject* placeHolder;
 };
 
+#endif OMEGAV_DICOMLOADER_H
+
diff --git a/src/src/QDicomViewer.cpp b/src/src/QDicomViewer.cpp
index 9ba728d..a72e0ca 100644
--- a/src/src/QDicomViewer.cpp
+++ b/src/src/QDicomViewer.cpp
@@ -1,5 +1,4 @@
 #include "QDicomViewer.h"
-#include "global/include_all.h"
 #include "base/SeriesImageSet.h"
 #include "view/subview/gridpopwidget.h"
 #include "view/ViewContainerWidget.h"
diff --git a/src/src/global/QGlobals.cpp b/src/src/global/QGlobals.cpp
index 45e8cd4..d8f8d6e 100644
--- a/src/src/global/QGlobals.cpp
+++ b/src/src/global/QGlobals.cpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "include_all.h"
 #include "include_vitk.h"
 
 int VCRHelper:: toolbar_coeff_inv =0;
diff --git a/src/src/global/include_all.h b/src/src/global/include_all.h
deleted file mode 100644
index 80c914c..0000000
--- a/src/src/global/include_all.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-#include <iostream>
-#include <string>
-#include <math.h>
-#include <iomanip>
-#include <stdio.h>
-#include "QGlobals.h"
-
-
diff --git a/src/src/global/include_dcmtk.h b/src/src/global/include_dcmtk.h
deleted file mode 100644
index 71adbd1..0000000
--- a/src/src/global/include_dcmtk.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "dcmtk/config/osconfig.h"
-#include "dcmtk/dcmdata/dcfilefo.h"
-#include "dcmtk/dcmdata/dcdatset.h"
-#include "dcmtk/dcmjpeg/djdecode.h"
-#include "dcmtk/dcmdata/dcrledrg.h"
-#include "dcmtk/dcmdata/dcdeftag.h"
-#include "dcmtk/ofstd/ofstdinc.h"
-#include "dcmtk/dcmdata/dclist.h"
-#include "dcmtk/dcmdata/dcmetinf.h"
-#include "dcmtk/dcmdata/dctk.h"
-
diff --git a/src/src/view/dicomimageview.cpp b/src/src/view/dicomimageview.cpp
index 8d63b26..8203937 100644
--- a/src/src/view/dicomimageview.cpp
+++ b/src/src/view/dicomimageview.cpp
@@ -11,8 +11,8 @@
 #include "cine/pqVCRToolbar.h"
 #include "vtkDiscretizableColorTransferFunction.h"
 #include "metaDataWindow.h"
+#include "dcmtk/dcmdata/dcfilefo.h"
 
-#include "include_dcmtk.h"
 //-----------------------------------------------------------------------------
 DicomImageView::DicomImageView(QWidget* parent)
 	: QFrame(parent)
diff --git a/src/src/view/subview/DicomTreeModel.cpp b/src/src/view/subview/DicomTreeModel.cpp
index 789511c..baa620f 100644
--- a/src/src/view/subview/DicomTreeModel.cpp
+++ b/src/src/view/subview/DicomTreeModel.cpp
@@ -12,8 +12,9 @@
 #include <QLinkedList>
 
 
-
-#include "include_dcmtk.h"
+//TODO: Extract IO logic
+#include "dcmtk/dcmdata/dcfilefo.h"
+#include "dcmtk/dcmdata/dcmetinf.h"
 
  // Maximal number of symbols to be used to display large tags data
 const int TagPreviewLength = 128;
diff --git a/src/src/view/subview/metaDataWindow.cpp b/src/src/view/subview/metaDataWindow.cpp
index ed50670..7db1679 100644
--- a/src/src/view/subview/metaDataWindow.cpp
+++ b/src/src/view/subview/metaDataWindow.cpp
@@ -1,15 +1,11 @@
 #include "metaDataWindow.h"
 #include <QHeaderView>
 #include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QLabel>
-
-#include "DicomTreeModel.h"
-#include "include_dcmtk.h"
-
-
-
 
+//TODO: Extract IO logic
+#include "dcmtk/dcmdata/dcfilefo.h"
+#include "dcmtk/dcmdata/dcmetinf.h"
+#include "dcmtk/dcmdata/dcdeftag.h"
 
 metaDataWindow::metaDataWindow(DcmFileFormat *file,QWidget *parent): QMdiSubWindow(parent)
 {