diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/PortCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/PortCppWriter.scala
index 5b10aac1f..ea427f26b 100644
--- a/compiler/lib/src/main/scala/codegen/CppWriter/PortCppWriter.scala
+++ b/compiler/lib/src/main/scala/codegen/CppWriter/PortCppWriter.scala
@@ -135,7 +135,10 @@ case class PortCppWriter (
 
   private def getHppIncludes: CppDoc.Member = {
     val unconditional = List.concat(
-      List("Fw/FPrimeBasicTypes.hpp").map(CppWriter.headerString),
+      List(
+        "Fw/FPrimeBasicTypes.hpp",
+        "Fw/Types/String.hpp"
+      ).map(CppWriter.headerString),
       writeIncludeDirectives
     ).sorted.map(line)
     val conditional = List.concat(
@@ -144,7 +147,6 @@ case class PortCppWriter (
         "Fw/Comp/PassiveComponentBase.hpp",
         "Fw/Port/InputPortBase.hpp",
         "Fw/Port/OutputPortBase.hpp",
-        "Fw/Types/String.hpp",
       )
     ).map(CppWriter.headerString).sorted.map(line)
     linesMember(
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/NoArgsPortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/NoArgsPortAc.ref.hpp
index dcae3b217..4b487a189 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/NoArgsPortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/NoArgsPortAc.ref.hpp
@@ -8,12 +8,12 @@
 #define Ports_NoArgsPortAc_HPP
 
 #include "Fw/FPrimeBasicTypes.hpp"
+#include "Fw/Types/String.hpp"
 #if !FW_DIRECT_PORT_CALLS
 #include "Fw/Comp/PassiveComponentBase.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/Serializable.hpp"
-#include "Fw/Types/String.hpp"
 #endif
 
 namespace Ports {
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/NoArgsReturnPortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/NoArgsReturnPortAc.ref.hpp
index 59240b3b9..90a157839 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/NoArgsReturnPortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/NoArgsReturnPortAc.ref.hpp
@@ -8,11 +8,11 @@
 #define Ports_NoArgsReturnPortAc_HPP
 
 #include "Fw/FPrimeBasicTypes.hpp"
+#include "Fw/Types/String.hpp"
 #if !FW_DIRECT_PORT_CALLS
 #include "Fw/Comp/PassiveComponentBase.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
-#include "Fw/Types/String.hpp"
 #endif
 
 namespace Ports {
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.hpp
index d77397b09..2f07cd711 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/TypedPortAc.ref.hpp
@@ -10,13 +10,13 @@
 #include "AArrayAc.hpp"
 #include "EEnumAc.hpp"
 #include "Fw/FPrimeBasicTypes.hpp"
+#include "Fw/Types/String.hpp"
 #include "SSerializableAc.hpp"
 #if !FW_DIRECT_PORT_CALLS
 #include "Fw/Comp/PassiveComponentBase.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/Serializable.hpp"
-#include "Fw/Types/String.hpp"
 #endif
 
 namespace Ports {
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.hpp
index f2f957515..d379b91e0 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/TypedReturnPortAc.ref.hpp
@@ -10,12 +10,12 @@
 #include "AArrayAc.hpp"
 #include "EEnumAc.hpp"
 #include "Fw/FPrimeBasicTypes.hpp"
+#include "Fw/Types/String.hpp"
 #include "SSerializableAc.hpp"
 #if !FW_DIRECT_PORT_CALLS
 #include "Fw/Comp/PassiveComponentBase.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
-#include "Fw/Types/String.hpp"
 #endif
 
 namespace Ports {
diff --git a/compiler/tools/fpp-to-cpp/test/port/AbsTypePortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/AbsTypePortAc.ref.hpp
index 4b331dd4e..2d7d0f418 100644
--- a/compiler/tools/fpp-to-cpp/test/port/AbsTypePortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/port/AbsTypePortAc.ref.hpp
@@ -8,13 +8,13 @@
 #define AbsTypePortAc_HPP
 
 #include "Fw/FPrimeBasicTypes.hpp"
+#include "Fw/Types/String.hpp"
 #include "include/T.hpp"
 #if !FW_DIRECT_PORT_CALLS
 #include "Fw/Comp/PassiveComponentBase.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/Serializable.hpp"
-#include "Fw/Types/String.hpp"
 #endif
 
 //! AbsType port constants
diff --git a/compiler/tools/fpp-to-cpp/test/port/EmptyPortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/EmptyPortAc.ref.hpp
index ddd9a273f..e6388a2be 100644
--- a/compiler/tools/fpp-to-cpp/test/port/EmptyPortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/port/EmptyPortAc.ref.hpp
@@ -8,12 +8,12 @@
 #define EmptyPortAc_HPP
 
 #include "Fw/FPrimeBasicTypes.hpp"
+#include "Fw/Types/String.hpp"
 #if !FW_DIRECT_PORT_CALLS
 #include "Fw/Comp/PassiveComponentBase.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/Serializable.hpp"
-#include "Fw/Types/String.hpp"
 #endif
 
 //! Empty port constants
diff --git a/compiler/tools/fpp-to-cpp/test/port/FppTypePortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/FppTypePortAc.ref.hpp
index 77ce9a8eb..63657e5e6 100644
--- a/compiler/tools/fpp-to-cpp/test/port/FppTypePortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/port/FppTypePortAc.ref.hpp
@@ -10,13 +10,13 @@
 #include "AArrayAc.hpp"
 #include "EEnumAc.hpp"
 #include "Fw/FPrimeBasicTypes.hpp"
+#include "Fw/Types/String.hpp"
 #include "SSerializableAc.hpp"
 #if !FW_DIRECT_PORT_CALLS
 #include "Fw/Comp/PassiveComponentBase.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/Serializable.hpp"
-#include "Fw/Types/String.hpp"
 #endif
 
 //! FppType port constants
diff --git a/compiler/tools/fpp-to-cpp/test/port/KwdNamePortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/KwdNamePortAc.ref.hpp
index 3d4b6d38b..bfeb6ea26 100644
--- a/compiler/tools/fpp-to-cpp/test/port/KwdNamePortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/port/KwdNamePortAc.ref.hpp
@@ -8,12 +8,12 @@
 #define KwdNamePortAc_HPP
 
 #include "Fw/FPrimeBasicTypes.hpp"
+#include "Fw/Types/String.hpp"
 #if !FW_DIRECT_PORT_CALLS
 #include "Fw/Comp/PassiveComponentBase.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/Serializable.hpp"
-#include "Fw/Types/String.hpp"
 #endif
 
 //! KwdName port constants
diff --git a/compiler/tools/fpp-to-cpp/test/port/PrimitivePortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/PrimitivePortAc.ref.hpp
index 54263b783..8847957d3 100644
--- a/compiler/tools/fpp-to-cpp/test/port/PrimitivePortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/port/PrimitivePortAc.ref.hpp
@@ -8,12 +8,12 @@
 #define PrimitivePortAc_HPP
 
 #include "Fw/FPrimeBasicTypes.hpp"
+#include "Fw/Types/String.hpp"
 #if !FW_DIRECT_PORT_CALLS
 #include "Fw/Comp/PassiveComponentBase.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/Serializable.hpp"
-#include "Fw/Types/String.hpp"
 #endif
 
 //! Primitive port constants
diff --git a/compiler/tools/fpp-to-cpp/test/port/ReturnTypePortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/ReturnTypePortAc.ref.hpp
index 5077dfabf..601d44251 100644
--- a/compiler/tools/fpp-to-cpp/test/port/ReturnTypePortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/port/ReturnTypePortAc.ref.hpp
@@ -8,11 +8,11 @@
 #define M_ReturnTypePortAc_HPP
 
 #include "Fw/FPrimeBasicTypes.hpp"
+#include "Fw/Types/String.hpp"
 #if !FW_DIRECT_PORT_CALLS
 #include "Fw/Comp/PassiveComponentBase.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
-#include "Fw/Types/String.hpp"
 #endif
 
 namespace M {
diff --git a/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.hpp
index 42d42f5cd..e43657730 100644
--- a/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.hpp
@@ -8,12 +8,12 @@
 #define StringPortAc_HPP
 
 #include "Fw/FPrimeBasicTypes.hpp"
+#include "Fw/Types/String.hpp"
 #if !FW_DIRECT_PORT_CALLS
 #include "Fw/Comp/PassiveComponentBase.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/Serializable.hpp"
-#include "Fw/Types/String.hpp"
 #endif
 
 //! String port constants
diff --git a/compiler/tools/fpp-to-cpp/test/port/StringReturnTypePortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/StringReturnTypePortAc.ref.hpp
index 43ba4e899..ed8957e48 100644
--- a/compiler/tools/fpp-to-cpp/test/port/StringReturnTypePortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/port/StringReturnTypePortAc.ref.hpp
@@ -8,11 +8,11 @@
 #define M_StringReturnTypePortAc_HPP
 
 #include "Fw/FPrimeBasicTypes.hpp"
+#include "Fw/Types/String.hpp"
 #if !FW_DIRECT_PORT_CALLS
 #include "Fw/Comp/PassiveComponentBase.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
-#include "Fw/Types/String.hpp"
 #endif
 
 namespace M {