From 7b910956bc70317d96cddf696b6d887b6701d734 Mon Sep 17 00:00:00 2001
From: Michael D Starch <Michael.D.Starch@jpl.nasa.gov>
Date: Fri, 26 May 2023 16:48:47 -0700
Subject: [PATCH 1/3] Fixing template component base includes

---
 .../fprime_ac/generators/templates/component/hpp.tmpl    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Autocoders/Python/src/fprime_ac/generators/templates/component/hpp.tmpl b/Autocoders/Python/src/fprime_ac/generators/templates/component/hpp.tmpl
index 9c6ffba64f..7b5eaa4842 100644
--- a/Autocoders/Python/src/fprime_ac/generators/templates/component/hpp.tmpl
+++ b/Autocoders/Python/src/fprime_ac/generators/templates/component/hpp.tmpl
@@ -13,7 +13,16 @@
 \#include <FpConfig.hpp>
 \#include <Fw/Port/InputSerializePort.hpp>
 \#include <Fw/Port/OutputSerializePort.hpp>
+
+#if $kind == "passive":
+\#include <Fw/Comp/PassiveComponentBase.hpp>
+#else if $kind == "queued":
+\#include <Fw/Comp/QueuedComponentBase.hpp>
+#else:
 \#include <Fw/Comp/ActiveComponentBase.hpp>
+#end if
+
+
 #if $has_guarded_ports or $has_parameters
 \#include <Os/Mutex.hpp>
 #end if

From c8d02ebb2e51c3bdeeed7507087bec1ba361ccbc Mon Sep 17 00:00:00 2001
From: Michael D Starch <Michael.D.Starch@jpl.nasa.gov>
Date: Fri, 26 May 2023 16:49:01 -0700
Subject: [PATCH 2/3] Making CAssert match Assert

---
 Fw/Types/CAssert.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Fw/Types/CAssert.h b/Fw/Types/CAssert.h
index 857e3ffa69..0b60953c0c 100644
--- a/Fw/Types/CAssert.h
+++ b/Fw/Types/CAssert.h
@@ -20,7 +20,7 @@
 #define FILE_NAME_ARG NATIVE_UINT_TYPE
 #define FW_CASSERT(cond) ((void)((cond) ? (0) : (CAssert0(ASSERT_FILE_ID, __LINE__))))
 #else
-#define FILE_NAME_ARG const U8*
+#define FILE_NAME_ARG const CHAR*
 #define FW_CASSERT(cond) ((void)((cond) ? (0) : (CAssert0((FILE_NAME_ARG)(__FILE__), __LINE__))))
 #endif
 

From 9831cfa606ef1e5c5623546bd6b1b269a4732cd6 Mon Sep 17 00:00:00 2001
From: Michael D Starch <Michael.D.Starch@jpl.nasa.gov>
Date: Mon, 29 May 2023 11:49:09 -0700
Subject: [PATCH 3/3] Fixing invalid template and missing header include

---
 .../src/fprime_ac/generators/templates/component/hpp.tmpl       | 2 --
 Svc/FatalHandler/FatalHandlerComponentLinuxImpl.cpp             | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Autocoders/Python/src/fprime_ac/generators/templates/component/hpp.tmpl b/Autocoders/Python/src/fprime_ac/generators/templates/component/hpp.tmpl
index 7b5eaa4842..4a9d7649b7 100644
--- a/Autocoders/Python/src/fprime_ac/generators/templates/component/hpp.tmpl
+++ b/Autocoders/Python/src/fprime_ac/generators/templates/component/hpp.tmpl
@@ -16,8 +16,6 @@
 
 #if $kind == "passive":
 \#include <Fw/Comp/PassiveComponentBase.hpp>
-#else if $kind == "queued":
-\#include <Fw/Comp/QueuedComponentBase.hpp>
 #else:
 \#include <Fw/Comp/ActiveComponentBase.hpp>
 #end if
diff --git a/Svc/FatalHandler/FatalHandlerComponentLinuxImpl.cpp b/Svc/FatalHandler/FatalHandlerComponentLinuxImpl.cpp
index 2805682255..ff72572eba 100644
--- a/Svc/FatalHandler/FatalHandlerComponentLinuxImpl.cpp
+++ b/Svc/FatalHandler/FatalHandlerComponentLinuxImpl.cpp
@@ -14,6 +14,7 @@
 #include <csignal>
 #include <Fw/Logger/Logger.hpp>
 #include <Svc/FatalHandler/FatalHandlerComponentImpl.hpp>
+#include <Os/Task.hpp>
 #include <FpConfig.hpp>
 
 namespace Svc {