diff --git a/unittest/core/CatchSetup.cpp b/unittest/core/CatchSetup.cpp
index cb5bd33e..99ee63b5 100644
--- a/unittest/core/CatchSetup.cpp
+++ b/unittest/core/CatchSetup.cpp
@@ -1,5 +1,5 @@
 #include "CatchDefinitions.h"
-#include "CatchFactory.h"
+#include <CatchFactory.h>
 
 #include <testcfg/cdatapool/dataPoolInit.h>
 
@@ -10,15 +10,11 @@
 #include "../../objectmanager/ObjectManager.h"
 #include "../../objectmanager/ObjectManagerIF.h"
 #include "../../storagemanager/StorageManagerIF.h"
-#include "../../datapool/DataPool.h"
 #include "../../serviceinterface/ServiceInterfaceStream.h"
 
 
 /* Global instantiations normally done in main.cpp */
 /* Initialize Data Pool */
-//namespace glob {
-DataPool dataPool(datapool::dataPoolInit);
-//}
 
 
 namespace sif {
diff --git a/unittest/testcfg/objects/CatchFactory.cpp b/unittest/testcfg/CatchFactory.cpp
similarity index 100%
rename from unittest/testcfg/objects/CatchFactory.cpp
rename to unittest/testcfg/CatchFactory.cpp
diff --git a/unittest/testcfg/objects/CatchFactory.h b/unittest/testcfg/CatchFactory.h
similarity index 100%
rename from unittest/testcfg/objects/CatchFactory.h
rename to unittest/testcfg/CatchFactory.h
diff --git a/unittest/testcfg/testcfg.mk b/unittest/testcfg/testcfg.mk
index 31d3b60a..fca2f732 100644
--- a/unittest/testcfg/testcfg.mk
+++ b/unittest/testcfg/testcfg.mk
@@ -6,11 +6,3 @@ CXXSRC += $(wildcard $(CURRENTPATH)/events/*.cpp)
 CXXSRC += $(wildcard $(CURRENTPATH)/*.cpp)
 
 INCLUDES += $(CURRENTPATH)
-INCLUDES += $(CURRENTPATH)/objects
-INCLUDES += $(CURRENTPATH)/ipc
-INCLUDES += $(CURRENTPATH)/pollingsequence
-INCLUDES += $(CURRENTPATH)/returnvalues
-INCLUDES += $(CURRENTPATH)/tmtc
-INCLUDES += $(CURRENTPATH)/events
-INCLUDES += $(CURRENTPATH)/devices
-INCLUDES += $(CURRENTPATH)/cdatapool