diff --git a/platform/aoc/system_timer.cc b/platform/aoc/system_timer.cc
index 4650f8c..d92ef77 100644
--- a/platform/aoc/system_timer.cc
+++ b/platform/aoc/system_timer.cc
@@ -16,6 +16,7 @@
 
 #include "chre/platform/system_timer.h"
 #include "chre/platform/assert.h"
+#include "chre/platform/fatal_error.h"
 #include "chre/platform/log.h"
 #include "chre/util/time.h"
 
diff --git a/platform/freertos/include/chre/target_platform/condition_variable_impl.h b/platform/freertos/include/chre/target_platform/condition_variable_impl.h
index 83dadae..b7b9569 100644
--- a/platform/freertos/include/chre/target_platform/condition_variable_impl.h
+++ b/platform/freertos/include/chre/target_platform/condition_variable_impl.h
@@ -19,6 +19,8 @@
 
 #include "chre/platform/condition_variable.h"
 
+#include "chre/platform/fatal_error.h"
+
 namespace chre {
 
 inline ConditionVariable::ConditionVariable() {
diff --git a/platform/freertos/include/chre/target_platform/mutex_base.h b/platform/freertos/include/chre/target_platform/mutex_base.h
index d26170a..707bf72 100644
--- a/platform/freertos/include/chre/target_platform/mutex_base.h
+++ b/platform/freertos/include/chre/target_platform/mutex_base.h
@@ -18,6 +18,7 @@
 #define CHRE_PLATFORM_FREERTOS_MUTEX_BASE_H_
 
 #include "chre/platform/assert.h"
+#include "chre/platform/fatal_error.h"
 #include "chre/platform/log.h"
 
 #include "FreeRTOS.h"
diff --git a/platform/shared/nanoapp_loader.cc b/platform/shared/nanoapp_loader.cc
index cd31614..5ebf5de 100644
--- a/platform/shared/nanoapp_loader.cc
+++ b/platform/shared/nanoapp_loader.cc
@@ -24,6 +24,7 @@
 #include "ash.h"
 #include "chre.h"
 #include "chre/platform/assert.h"
+#include "chre/platform/fatal_error.h"
 #include "chre/platform/shared/debug_dump.h"
 #include "chre/platform/shared/memory.h"
 #include "chre/target_platform/platform_cache_management.h"