diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ef375d..a7071d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,20 @@
 cmake_minimum_required(VERSION 3.5)
 project(CFS_SCH_LAB C)
 
-include_directories(fsw/mission_inc)
-include_directories(fsw/platform_inc)
-include_directories(${ci_lab_MISSION_DIR}/fsw/platform_inc)
-include_directories(${to_lab_MISSION_DIR}/fsw/platform_inc)
-include_directories(${sample_app_MISSION_DIR}/fsw/platform_inc)
+# These references are specifically needed for the table build
+# it is easiest to add them as directory properties so they won't
+# be considered include directories for SCH_LAB itself.
+include_directories(
+    $<TARGET_PROPERTY:ci_lab,INTERFACE_INCLUDE_DIRECTORIES>
+    $<TARGET_PROPERTY:to_lab,INTERFACE_INCLUDE_DIRECTORIES>
+    $<TARGET_PROPERTY:sample_app,INTERFACE_INCLUDE_DIRECTORIES>
+)
 
 # Create the app module
 add_cfe_app(sch_lab fsw/src/sch_lab_app.c)
-add_cfe_tables(sch_lab_table fsw/tables/sch_lab_table.c)
+add_cfe_tables(sch_lab fsw/tables/sch_lab_table.c)
+
+target_include_directories(sch_lab PUBLIC
+    fsw/mission_inc
+    fsw/platform_inc
+)