diff --git a/include/cm/cm.h b/include/cm/cm.h
index e6a235e..def455c 100644
--- a/include/cm/cm.h
+++ b/include/cm/cm.h
@@ -10,7 +10,7 @@
 
 #include <types.h>
 #include <stdarg.h>
-#ifdef KERNEL
+#if defined(KERNEL) || defined (UNITTEST)
     #include <cm/osif.h>
     #include <cm/syscall.h>
 #else
diff --git a/include/cm/err.h b/include/cm/err.h
index 5a1872f..c85c19f 100644
--- a/include/cm/err.h
+++ b/include/cm/err.h
@@ -5,7 +5,7 @@
  */
 
 #include <stdint.h>
-#ifdef KERNEL
+#if defined(KERNEL) || defined (UNITTEST)
     #include <cm/debug.h>
     #include <cm/syscall.h>
     #include <cm/osif.h>
diff --git a/include/cm/graphics.h b/include/cm/graphics.h
index 8552244..be7da98 100644
--- a/include/cm/graphics.h
+++ b/include/cm/graphics.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <types.h>
-#ifdef KERNEL
+#if defined(KERNEL) || defined (UNITTEST)
     #include <cm/osif.h>
 #else
     #include <osif.h>
diff --git a/include/cm/syscall.h b/include/cm/syscall.h
index 50c3d21..16608d9 100644
--- a/include/cm/syscall.h
+++ b/include/cm/syscall.h
@@ -7,10 +7,7 @@
 #pragma once
 
 #include <types.h>
-// App library is built with the with Kernel flags and kernel include directories. Whereas when
-// applications will include this header (either directly or indirectly) the include path will
-// differ, thus this change in the way applib headers are included here.
-#ifdef KERNEL
+#if defined(KERNEL) || defined (UNITTEST)
     #include <cm/osif.h>
 #else
     #include <osif.h>