diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9070c2a..75c0752 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,10 @@
 cmake_minimum_required(VERSION 3.5)
 project(CFS_CI_LAB C)
 
-include_directories(fsw/mission_inc)
-include_directories(fsw/platform_inc)
-
 aux_source_directory(fsw/src APP_SRC_FILES)
 
 # Create the app module
 add_cfe_app(ci_lab ${APP_SRC_FILES})
 
+# This permits direct access to public headers in the fsw/inc dir
+target_include_directories(ci_lab PUBLIC fsw/inc)
\ No newline at end of file
diff --git a/fsw/src/ci_lab_events.h b/fsw/inc/ci_lab_events.h
similarity index 100%
rename from fsw/src/ci_lab_events.h
rename to fsw/inc/ci_lab_events.h
diff --git a/fsw/src/ci_lab_msg.h b/fsw/inc/ci_lab_msg.h
similarity index 100%
rename from fsw/src/ci_lab_msg.h
rename to fsw/inc/ci_lab_msg.h
diff --git a/fsw/platform_inc/ci_lab_msgids.h b/fsw/inc/ci_lab_msgids.h
similarity index 100%
rename from fsw/platform_inc/ci_lab_msgids.h
rename to fsw/inc/ci_lab_msgids.h
diff --git a/fsw/mission_inc/ci_lab_perfids.h b/fsw/inc/ci_lab_perfids.h
similarity index 100%
rename from fsw/mission_inc/ci_lab_perfids.h
rename to fsw/inc/ci_lab_perfids.h