diff --git a/Microchip/ATSAME54-XPRO/app/CMakeLists.txt b/Microchip/ATSAME54-XPRO/app/CMakeLists.txt
index 5cab31b5..3595fdbe 100644
--- a/Microchip/ATSAME54-XPRO/app/CMakeLists.txt
+++ b/Microchip/ATSAME54-XPRO/app/CMakeLists.txt
@@ -15,6 +15,10 @@ set(SOURCES
 )
 
 add_executable(${PROJECT_NAME} ${SOURCES})
+target_include_directories(${PROJECT_NAME} 
+    PUBLIC 
+        lib/device_config
+)
 
 target_link_libraries(${PROJECT_NAME}
     PUBLIC
@@ -30,6 +34,7 @@ target_link_libraries(${PROJECT_NAME}
         device_config
 )
 
+
 target_link_options(${PROJECT_NAME}
     PRIVATE 
         -T${LINKER_SCRIPT} -Wl,-Map=${PROJECT_NAME}.map)
diff --git a/Microchip/ATSAME54-XPRO/lib/device_config/device_config.h b/Microchip/ATSAME54-XPRO/lib/device_config/device_config.h
index f07de687..2766fd35 100644
--- a/Microchip/ATSAME54-XPRO/lib/device_config/device_config.h
+++ b/Microchip/ATSAME54-XPRO/lib/device_config/device_config.h
@@ -1,6 +1,9 @@
 /* Copyright (c) Microsoft Corporation.
    Licensed under the MIT License. */
 
+#ifndef _DEVICE_CONFIG_H
+#define _DEVICE_CONFIG_H
+
 #include <string.h>
 #include <stdio.h>
 #include <stdbool.h>
@@ -50,3 +53,5 @@ FLASH_Status_t erase_flash(void);
 
 /* Read Azure IoT credentials from flash */
 FLASH_Status_t read_flash(DevConfig_IoT_Info_t* info);
+
+#endif // _DEVICE_CONFIG_H