From 176ca56e355405d4e9d81e503187e2f87d87f84f Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Thu, 29 Oct 2020 15:12:05 +0100
Subject: [PATCH] core changes taken over

---
 unittest/core/CatchDefinitions.cpp | 2 +-
 unittest/core/CatchDefinitions.h   | 4 +++-
 unittest/core/CatchSetup.cpp       | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/unittest/core/CatchDefinitions.cpp b/unittest/core/CatchDefinitions.cpp
index 3f4614e81..0b66558ac 100644
--- a/unittest/core/CatchDefinitions.cpp
+++ b/unittest/core/CatchDefinitions.cpp
@@ -1,5 +1,5 @@
+#include "CatchDefinitions.h"
 #include <fsfw/objectmanager/ObjectManagerIF.h>
-#include <fsfw/unittest/core/CatchDefinitions.h>
 
 StorageManagerIF* tglob::getIpcStoreHandle() {
 	if(objectManager != nullptr) {
diff --git a/unittest/core/CatchDefinitions.h b/unittest/core/CatchDefinitions.h
index cdc025fa1..366cda7e5 100644
--- a/unittest/core/CatchDefinitions.h
+++ b/unittest/core/CatchDefinitions.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef FSFW_UNITTEST_CORE_CATCHDEFINITIONS_H_
+#define FSFW_UNITTEST_CORE_CATCHDEFINITIONS_H_
 
 #include <fsfw/ipc/messageQueueDefinitions.h>
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
@@ -17,3 +18,4 @@ namespace tglob {
 	StorageManagerIF* getIpcStoreHandle();
 }
 
+#endif /* FSFW_UNITTEST_CORE_CATCHDEFINITIONS_H_ */
diff --git a/unittest/core/CatchSetup.cpp b/unittest/core/CatchSetup.cpp
index a623fb776..5749ecd11 100644
--- a/unittest/core/CatchSetup.cpp
+++ b/unittest/core/CatchSetup.cpp
@@ -1,7 +1,7 @@
 #include "CatchDefinitions.h"
 
-#include "../config/cdatapool/dataPoolInit.h"
-#include "../config/objects/Factory.h"
+#include <testcfg/cdatapool/dataPoolInit.h>
+#include <testcfg/objects/Factory.h>
 
 
 #ifdef GCOV