diff --git a/examples/position_sense/tamagawa_diagnostic/multi_channel/.project/project_am243x.js b/examples/position_sense/tamagawa_diagnostic/multi_channel/.project/project_am243x.js
index dc901c2..948385a 100644
--- a/examples/position_sense/tamagawa_diagnostic/multi_channel/.project/project_am243x.js
+++ b/examples/position_sense/tamagawa_diagnostic/multi_channel/.project/project_am243x.js
@@ -5,7 +5,6 @@ let device = "am243x";
 const files = {
     common: [
         "tamagawa_diagnostic.c",
-        "tamagawa_periodic_trigger.h",
         "tamagawa_periodic_trigger.c",
         "main.c",
     ],
@@ -36,6 +35,7 @@ const includes_freertos_r5f = {
         "${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/FreeRTOS-Kernel/include",
         "${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/portable/TI_ARM_CLANG/ARM_CR5F",
         "${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/config/am243x/r5f",
+        "${MOTOR_CONTROL_SDK_PATH}/examples/position_sense/tamagawa_diagnostic",
     ],
 };
 
diff --git a/examples/position_sense/tamagawa_diagnostic/multi_channel/.project/project_am64x.js b/examples/position_sense/tamagawa_diagnostic/multi_channel/.project/project_am64x.js
index 034e212..4472243 100644
--- a/examples/position_sense/tamagawa_diagnostic/multi_channel/.project/project_am64x.js
+++ b/examples/position_sense/tamagawa_diagnostic/multi_channel/.project/project_am64x.js
@@ -5,7 +5,6 @@ let device = "am64x";
 const files = {
     common: [
         "tamagawa_diagnostic.c",
-        "tamagawa_periodic_trigger.h",
         "tamagawa_periodic_trigger.c",
         "main.c",
     ],
@@ -36,6 +35,7 @@ const includes_freertos_r5f = {
         "${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/FreeRTOS-Kernel/include",
         "${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/portable/TI_ARM_CLANG/ARM_CR5F",
         "${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/config/am64x/r5f",
+        "${MOTOR_CONTROL_SDK_PATH}/examples/position_sense/tamagawa_diagnostic",
     ],
 };
 
diff --git a/examples/position_sense/tamagawa_diagnostic/multi_channel/am243x-evm/r5fss0-0_freertos/ti-arm-clang/example.projectspec b/examples/position_sense/tamagawa_diagnostic/multi_channel/am243x-evm/r5fss0-0_freertos/ti-arm-clang/example.projectspec
index f0aa761..2f38ef4 100644
--- a/examples/position_sense/tamagawa_diagnostic/multi_channel/am243x-evm/r5fss0-0_freertos/ti-arm-clang/example.projectspec
+++ b/examples/position_sense/tamagawa_diagnostic/multi_channel/am243x-evm/r5fss0-0_freertos/ti-arm-clang/example.projectspec
@@ -35,6 +35,7 @@
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/FreeRTOS-Kernel/include
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/portable/TI_ARM_CLANG/ARM_CR5F
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/config/am243x/r5f
+            -I${MOTOR_CONTROL_SDK_PATH}/examples/position_sense/tamagawa_diagnostic
             -mcpu=cortex-r5
             -mfloat-abi=hard
             -mfpu=vfpv3-d16
@@ -97,8 +98,6 @@
         <pathVariable name="MOTOR_CONTROL_SDK_PATH" path="${COM_TI_MOTOR_CONTROL_SDK_AMXXX_INSTALL_DIR}" scope="project" />
         <file path="../../../../tamagawa_diagnostic.c" openOnCreation="false" excludeFromBuild="false" action="copy">
         </file>
-        <file path="../../../../tamagawa_periodic_trigger.h" openOnCreation="false" excludeFromBuild="false" action="copy">
-        </file>
         <file path="../../../../tamagawa_periodic_trigger.c" openOnCreation="false" excludeFromBuild="false" action="copy">
         </file>
         <file path="../main.c" openOnCreation="false" excludeFromBuild="false" action="copy">
diff --git a/examples/position_sense/tamagawa_diagnostic/multi_channel/am243x-evm/r5fss0-0_freertos/ti-arm-clang/makefile b/examples/position_sense/tamagawa_diagnostic/multi_channel/am243x-evm/r5fss0-0_freertos/ti-arm-clang/makefile
index 2706abc..4533cc7 100644
--- a/examples/position_sense/tamagawa_diagnostic/multi_channel/am243x-evm/r5fss0-0_freertos/ti-arm-clang/makefile
+++ b/examples/position_sense/tamagawa_diagnostic/multi_channel/am243x-evm/r5fss0-0_freertos/ti-arm-clang/makefile
@@ -39,7 +39,6 @@ endif
 
 FILES_common := \
 	tamagawa_diagnostic.c \
-	tamagawa_periodic_trigger.h \
 	tamagawa_periodic_trigger.c \
 	main.c \
 	ti_drivers_config.c \
@@ -63,6 +62,7 @@ INCLUDES_common := \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/FreeRTOS-Kernel/include \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/portable/TI_ARM_CLANG/ARM_CR5F \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/config/am243x/r5f \
+	-I${MOTOR_CONTROL_SDK_PATH}/examples/position_sense/tamagawa_diagnostic \
 	-Igenerated \
 
 DEFINES_common := \
diff --git a/examples/position_sense/tamagawa_diagnostic/multi_channel/am243x-lp/r5fss0-0_freertos/ti-arm-clang/example.projectspec b/examples/position_sense/tamagawa_diagnostic/multi_channel/am243x-lp/r5fss0-0_freertos/ti-arm-clang/example.projectspec
index 2b7d6f8..0637745 100644
--- a/examples/position_sense/tamagawa_diagnostic/multi_channel/am243x-lp/r5fss0-0_freertos/ti-arm-clang/example.projectspec
+++ b/examples/position_sense/tamagawa_diagnostic/multi_channel/am243x-lp/r5fss0-0_freertos/ti-arm-clang/example.projectspec
@@ -35,6 +35,7 @@
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/FreeRTOS-Kernel/include
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/portable/TI_ARM_CLANG/ARM_CR5F
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/config/am243x/r5f
+            -I${MOTOR_CONTROL_SDK_PATH}/examples/position_sense/tamagawa_diagnostic
             -mcpu=cortex-r5
             -mfloat-abi=hard
             -mfpu=vfpv3-d16
@@ -97,8 +98,6 @@
         <pathVariable name="MOTOR_CONTROL_SDK_PATH" path="${COM_TI_MOTOR_CONTROL_SDK_AMXXX_INSTALL_DIR}" scope="project" />
         <file path="../../../../tamagawa_diagnostic.c" openOnCreation="false" excludeFromBuild="false" action="copy">
         </file>
-        <file path="../../../../tamagawa_periodic_trigger.h" openOnCreation="false" excludeFromBuild="false" action="copy">
-        </file>
         <file path="../../../../tamagawa_periodic_trigger.c" openOnCreation="false" excludeFromBuild="false" action="copy">
         </file>
         <file path="../main.c" openOnCreation="false" excludeFromBuild="false" action="copy">
diff --git a/examples/position_sense/tamagawa_diagnostic/multi_channel/am243x-lp/r5fss0-0_freertos/ti-arm-clang/makefile b/examples/position_sense/tamagawa_diagnostic/multi_channel/am243x-lp/r5fss0-0_freertos/ti-arm-clang/makefile
index a211e92..95a8956 100644
--- a/examples/position_sense/tamagawa_diagnostic/multi_channel/am243x-lp/r5fss0-0_freertos/ti-arm-clang/makefile
+++ b/examples/position_sense/tamagawa_diagnostic/multi_channel/am243x-lp/r5fss0-0_freertos/ti-arm-clang/makefile
@@ -39,7 +39,6 @@ endif
 
 FILES_common := \
 	tamagawa_diagnostic.c \
-	tamagawa_periodic_trigger.h \
 	tamagawa_periodic_trigger.c \
 	main.c \
 	ti_drivers_config.c \
@@ -63,6 +62,7 @@ INCLUDES_common := \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/FreeRTOS-Kernel/include \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/portable/TI_ARM_CLANG/ARM_CR5F \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/config/am243x/r5f \
+	-I${MOTOR_CONTROL_SDK_PATH}/examples/position_sense/tamagawa_diagnostic \
 	-Igenerated \
 
 DEFINES_common := \
diff --git a/examples/position_sense/tamagawa_diagnostic/multi_channel/am64x-evm/r5fss0-0_freertos/ti-arm-clang/example.projectspec b/examples/position_sense/tamagawa_diagnostic/multi_channel/am64x-evm/r5fss0-0_freertos/ti-arm-clang/example.projectspec
index 109f51c..95aebc6 100644
--- a/examples/position_sense/tamagawa_diagnostic/multi_channel/am64x-evm/r5fss0-0_freertos/ti-arm-clang/example.projectspec
+++ b/examples/position_sense/tamagawa_diagnostic/multi_channel/am64x-evm/r5fss0-0_freertos/ti-arm-clang/example.projectspec
@@ -35,6 +35,7 @@
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/FreeRTOS-Kernel/include
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/portable/TI_ARM_CLANG/ARM_CR5F
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/config/am64x/r5f
+            -I${MOTOR_CONTROL_SDK_PATH}/examples/position_sense/tamagawa_diagnostic
             -mcpu=cortex-r5
             -mfloat-abi=hard
             -mfpu=vfpv3-d16
@@ -97,8 +98,6 @@
         <pathVariable name="MOTOR_CONTROL_SDK_PATH" path="${COM_TI_MOTOR_CONTROL_SDK_AMXXX_INSTALL_DIR}" scope="project" />
         <file path="../../../../tamagawa_diagnostic.c" openOnCreation="false" excludeFromBuild="false" action="copy">
         </file>
-        <file path="../../../../tamagawa_periodic_trigger.h" openOnCreation="false" excludeFromBuild="false" action="copy">
-        </file>
         <file path="../../../../tamagawa_periodic_trigger.c" openOnCreation="false" excludeFromBuild="false" action="copy">
         </file>
         <file path="../main.c" openOnCreation="false" excludeFromBuild="false" action="copy">
diff --git a/examples/position_sense/tamagawa_diagnostic/multi_channel/am64x-evm/r5fss0-0_freertos/ti-arm-clang/makefile b/examples/position_sense/tamagawa_diagnostic/multi_channel/am64x-evm/r5fss0-0_freertos/ti-arm-clang/makefile
index a32c816..b5ba3d6 100644
--- a/examples/position_sense/tamagawa_diagnostic/multi_channel/am64x-evm/r5fss0-0_freertos/ti-arm-clang/makefile
+++ b/examples/position_sense/tamagawa_diagnostic/multi_channel/am64x-evm/r5fss0-0_freertos/ti-arm-clang/makefile
@@ -39,7 +39,6 @@ endif
 
 FILES_common := \
 	tamagawa_diagnostic.c \
-	tamagawa_periodic_trigger.h \
 	tamagawa_periodic_trigger.c \
 	main.c \
 	ti_drivers_config.c \
@@ -63,6 +62,7 @@ INCLUDES_common := \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/FreeRTOS-Kernel/include \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/portable/TI_ARM_CLANG/ARM_CR5F \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/config/am64x/r5f \
+	-I${MOTOR_CONTROL_SDK_PATH}/examples/position_sense/tamagawa_diagnostic \
 	-Igenerated \
 
 DEFINES_common := \
diff --git a/examples/position_sense/tamagawa_diagnostic/single_channel/.project/project_am243x.js b/examples/position_sense/tamagawa_diagnostic/single_channel/.project/project_am243x.js
index c0a1233..a4f154e 100644
--- a/examples/position_sense/tamagawa_diagnostic/single_channel/.project/project_am243x.js
+++ b/examples/position_sense/tamagawa_diagnostic/single_channel/.project/project_am243x.js
@@ -5,7 +5,6 @@ let device = "am243x";
 const files = {
     common: [
         "tamagawa_diagnostic.c",
-        "tamagawa_periodic_trigger.h",
         "tamagawa_periodic_trigger.c",
         "main.c",
     ],
@@ -36,6 +35,7 @@ const includes_freertos_r5f = {
         "${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/FreeRTOS-Kernel/include",
         "${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/portable/TI_ARM_CLANG/ARM_CR5F",
         "${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/config/am243x/r5f",
+        "${MOTOR_CONTROL_SDK_PATH}/examples/position_sense/tamagawa_diagnostic",
     ],
 };
 
diff --git a/examples/position_sense/tamagawa_diagnostic/single_channel/.project/project_am64x.js b/examples/position_sense/tamagawa_diagnostic/single_channel/.project/project_am64x.js
index d16b0f3..295cace 100644
--- a/examples/position_sense/tamagawa_diagnostic/single_channel/.project/project_am64x.js
+++ b/examples/position_sense/tamagawa_diagnostic/single_channel/.project/project_am64x.js
@@ -5,7 +5,6 @@ let device = "am64x";
 const files = {
     common: [
         "tamagawa_diagnostic.c",
-        "tamagawa_periodic_trigger.h",
         "tamagawa_periodic_trigger.c",
         "main.c",
     ],
@@ -36,6 +35,7 @@ const includes_freertos_r5f = {
         "${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/FreeRTOS-Kernel/include",
         "${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/portable/TI_ARM_CLANG/ARM_CR5F",
         "${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/config/am64x/r5f",
+        "${MOTOR_CONTROL_SDK_PATH}/examples/position_sense/tamagawa_diagnostic",
     ],
 };
 
diff --git a/examples/position_sense/tamagawa_diagnostic/single_channel/am243x-evm/r5fss0-0_freertos/ti-arm-clang/example.projectspec b/examples/position_sense/tamagawa_diagnostic/single_channel/am243x-evm/r5fss0-0_freertos/ti-arm-clang/example.projectspec
index 2bb6b23..e7c6c62 100644
--- a/examples/position_sense/tamagawa_diagnostic/single_channel/am243x-evm/r5fss0-0_freertos/ti-arm-clang/example.projectspec
+++ b/examples/position_sense/tamagawa_diagnostic/single_channel/am243x-evm/r5fss0-0_freertos/ti-arm-clang/example.projectspec
@@ -35,6 +35,7 @@
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/FreeRTOS-Kernel/include
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/portable/TI_ARM_CLANG/ARM_CR5F
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/config/am243x/r5f
+            -I${MOTOR_CONTROL_SDK_PATH}/examples/position_sense/tamagawa_diagnostic
             -mcpu=cortex-r5
             -mfloat-abi=hard
             -mfpu=vfpv3-d16
@@ -97,8 +98,6 @@
         <pathVariable name="MOTOR_CONTROL_SDK_PATH" path="${COM_TI_MOTOR_CONTROL_SDK_AMXXX_INSTALL_DIR}" scope="project" />
         <file path="../../../../tamagawa_diagnostic.c" openOnCreation="false" excludeFromBuild="false" action="copy">
         </file>
-        <file path="../../../../tamagawa_periodic_trigger.h" openOnCreation="false" excludeFromBuild="false" action="copy">
-        </file>
         <file path="../../../../tamagawa_periodic_trigger.c" openOnCreation="false" excludeFromBuild="false" action="copy">
         </file>
         <file path="../main.c" openOnCreation="false" excludeFromBuild="false" action="copy">
diff --git a/examples/position_sense/tamagawa_diagnostic/single_channel/am243x-evm/r5fss0-0_freertos/ti-arm-clang/makefile b/examples/position_sense/tamagawa_diagnostic/single_channel/am243x-evm/r5fss0-0_freertos/ti-arm-clang/makefile
index 2da3576..200d659 100644
--- a/examples/position_sense/tamagawa_diagnostic/single_channel/am243x-evm/r5fss0-0_freertos/ti-arm-clang/makefile
+++ b/examples/position_sense/tamagawa_diagnostic/single_channel/am243x-evm/r5fss0-0_freertos/ti-arm-clang/makefile
@@ -39,7 +39,6 @@ endif
 
 FILES_common := \
 	tamagawa_diagnostic.c \
-	tamagawa_periodic_trigger.h \
 	tamagawa_periodic_trigger.c \
 	main.c \
 	ti_drivers_config.c \
@@ -63,6 +62,7 @@ INCLUDES_common := \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/FreeRTOS-Kernel/include \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/portable/TI_ARM_CLANG/ARM_CR5F \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/config/am243x/r5f \
+	-I${MOTOR_CONTROL_SDK_PATH}/examples/position_sense/tamagawa_diagnostic \
 	-Igenerated \
 
 DEFINES_common := \
diff --git a/examples/position_sense/tamagawa_diagnostic/single_channel/am243x-lp/r5fss0-0_freertos/ti-arm-clang/example.projectspec b/examples/position_sense/tamagawa_diagnostic/single_channel/am243x-lp/r5fss0-0_freertos/ti-arm-clang/example.projectspec
index 54a308d..b04db9a 100644
--- a/examples/position_sense/tamagawa_diagnostic/single_channel/am243x-lp/r5fss0-0_freertos/ti-arm-clang/example.projectspec
+++ b/examples/position_sense/tamagawa_diagnostic/single_channel/am243x-lp/r5fss0-0_freertos/ti-arm-clang/example.projectspec
@@ -35,6 +35,7 @@
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/FreeRTOS-Kernel/include
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/portable/TI_ARM_CLANG/ARM_CR5F
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/config/am243x/r5f
+            -I${MOTOR_CONTROL_SDK_PATH}/examples/position_sense/tamagawa_diagnostic
             -mcpu=cortex-r5
             -mfloat-abi=hard
             -mfpu=vfpv3-d16
@@ -97,8 +98,6 @@
         <pathVariable name="MOTOR_CONTROL_SDK_PATH" path="${COM_TI_MOTOR_CONTROL_SDK_AMXXX_INSTALL_DIR}" scope="project" />
         <file path="../../../../tamagawa_diagnostic.c" openOnCreation="false" excludeFromBuild="false" action="copy">
         </file>
-        <file path="../../../../tamagawa_periodic_trigger.h" openOnCreation="false" excludeFromBuild="false" action="copy">
-        </file>
         <file path="../../../../tamagawa_periodic_trigger.c" openOnCreation="false" excludeFromBuild="false" action="copy">
         </file>
         <file path="../main.c" openOnCreation="false" excludeFromBuild="false" action="copy">
diff --git a/examples/position_sense/tamagawa_diagnostic/single_channel/am243x-lp/r5fss0-0_freertos/ti-arm-clang/makefile b/examples/position_sense/tamagawa_diagnostic/single_channel/am243x-lp/r5fss0-0_freertos/ti-arm-clang/makefile
index 239b4d8..8116e80 100644
--- a/examples/position_sense/tamagawa_diagnostic/single_channel/am243x-lp/r5fss0-0_freertos/ti-arm-clang/makefile
+++ b/examples/position_sense/tamagawa_diagnostic/single_channel/am243x-lp/r5fss0-0_freertos/ti-arm-clang/makefile
@@ -39,7 +39,6 @@ endif
 
 FILES_common := \
 	tamagawa_diagnostic.c \
-	tamagawa_periodic_trigger.h \
 	tamagawa_periodic_trigger.c \
 	main.c \
 	ti_drivers_config.c \
@@ -63,6 +62,7 @@ INCLUDES_common := \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/FreeRTOS-Kernel/include \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/portable/TI_ARM_CLANG/ARM_CR5F \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/config/am243x/r5f \
+	-I${MOTOR_CONTROL_SDK_PATH}/examples/position_sense/tamagawa_diagnostic \
 	-Igenerated \
 
 DEFINES_common := \
diff --git a/examples/position_sense/tamagawa_diagnostic/single_channel/am64x-evm/r5fss0-0_freertos/ti-arm-clang/example.projectspec b/examples/position_sense/tamagawa_diagnostic/single_channel/am64x-evm/r5fss0-0_freertos/ti-arm-clang/example.projectspec
index 71e8fcc..cd6ffe0 100644
--- a/examples/position_sense/tamagawa_diagnostic/single_channel/am64x-evm/r5fss0-0_freertos/ti-arm-clang/example.projectspec
+++ b/examples/position_sense/tamagawa_diagnostic/single_channel/am64x-evm/r5fss0-0_freertos/ti-arm-clang/example.projectspec
@@ -35,6 +35,7 @@
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/FreeRTOS-Kernel/include
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/portable/TI_ARM_CLANG/ARM_CR5F
             -I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/config/am64x/r5f
+            -I${MOTOR_CONTROL_SDK_PATH}/examples/position_sense/tamagawa_diagnostic
             -mcpu=cortex-r5
             -mfloat-abi=hard
             -mfpu=vfpv3-d16
@@ -97,8 +98,6 @@
         <pathVariable name="MOTOR_CONTROL_SDK_PATH" path="${COM_TI_MOTOR_CONTROL_SDK_AMXXX_INSTALL_DIR}" scope="project" />
         <file path="../../../../tamagawa_diagnostic.c" openOnCreation="false" excludeFromBuild="false" action="copy">
         </file>
-        <file path="../../../../tamagawa_periodic_trigger.h" openOnCreation="false" excludeFromBuild="false" action="copy">
-        </file>
         <file path="../../../../tamagawa_periodic_trigger.c" openOnCreation="false" excludeFromBuild="false" action="copy">
         </file>
         <file path="../main.c" openOnCreation="false" excludeFromBuild="false" action="copy">
diff --git a/examples/position_sense/tamagawa_diagnostic/single_channel/am64x-evm/r5fss0-0_freertos/ti-arm-clang/makefile b/examples/position_sense/tamagawa_diagnostic/single_channel/am64x-evm/r5fss0-0_freertos/ti-arm-clang/makefile
index f71645f..4095318 100644
--- a/examples/position_sense/tamagawa_diagnostic/single_channel/am64x-evm/r5fss0-0_freertos/ti-arm-clang/makefile
+++ b/examples/position_sense/tamagawa_diagnostic/single_channel/am64x-evm/r5fss0-0_freertos/ti-arm-clang/makefile
@@ -39,7 +39,6 @@ endif
 
 FILES_common := \
 	tamagawa_diagnostic.c \
-	tamagawa_periodic_trigger.h \
 	tamagawa_periodic_trigger.c \
 	main.c \
 	ti_drivers_config.c \
@@ -63,6 +62,7 @@ INCLUDES_common := \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/FreeRTOS-Kernel/include \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/portable/TI_ARM_CLANG/ARM_CR5F \
 	-I${MOTOR_CONTROL_SDK_PATH}/mcu_plus_sdk/source/kernel/freertos/config/am64x/r5f \
+	-I${MOTOR_CONTROL_SDK_PATH}/examples/position_sense/tamagawa_diagnostic \
 	-Igenerated \
 
 DEFINES_common := \