diff --git a/events/Event.h b/events/Event.h
index e22c9db1..f8410f32 100644
--- a/events/Event.h
+++ b/events/Event.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include "fwSubsystemIdRanges.h"
 //could be move to more suitable location
-#include <config/tmtc/subsystemIdRanges.h>
+#include <subsystemIdRanges.h>
 
 typedef uint16_t EventId_t;
 typedef uint8_t EventSeverity_t;
diff --git a/returnvalues/HasReturnvaluesIF.h b/returnvalues/HasReturnvaluesIF.h
index 5fef91dd..3d3e3208 100644
--- a/returnvalues/HasReturnvaluesIF.h
+++ b/returnvalues/HasReturnvaluesIF.h
@@ -2,7 +2,7 @@
 #define FRAMEWORK_RETURNVALUES_HASRETURNVALUESIF_H_
 
 #include "FwClassIds.h"
-#include <config/returnvalues/classIds.h>
+#include <returnvalues/classIds.h>
 #include <cstdint>
 
 #define MAKE_RETURN_CODE( number )	((INTERFACE_ID << 8) + (number))
diff --git a/unittest b/unittest
index b99077c7..76cbb97a 160000
--- a/unittest
+++ b/unittest
@@ -1 +1 @@
-Subproject commit b99077c7f94916b677f45a97ccb80613c0932f47
+Subproject commit 76cbb97ae410a7440d2b71eaecd4eea4a5cccaf3