diff --git a/compiler/.gitignore b/compiler/.gitignore
index 1cfe30acf..4296a0b8d 100644
--- a/compiler/.gitignore
+++ b/compiler/.gitignore
@@ -5,3 +5,5 @@ test-output.txt
 *.o
 native-fpp-*
 *.class
+# Version is not checked in during typical development
+lib/src/main/scala/util/Version.scala
diff --git a/compiler/lib/src/main/scala/analysis/Analyzers/UseAnalyzer.scala b/compiler/lib/src/main/scala/analysis/Analyzers/UseAnalyzer.scala
index 894e07e06..8afc23a39 100644
--- a/compiler/lib/src/main/scala/analysis/Analyzers/UseAnalyzer.scala
+++ b/compiler/lib/src/main/scala/analysis/Analyzers/UseAnalyzer.scala
@@ -90,7 +90,7 @@ trait UseAnalyzer extends TypeExpressionAnalyzer {
       case direct : Ast.SpecConnectionGraph.Direct => visitList(a, direct.connections, connection)
       case pattern : Ast.SpecConnectionGraph.Pattern => for {
         a <- qualIdentNode (componentInstanceUse) (a, pattern.source)
-        a <- visitList(a, pattern.targets, qualIdentNode (componentInstanceUse) _)
+        a <- visitList(a, pattern.targets, qualIdentNode(componentInstanceUse))
       } yield a
     }
   }
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/AliasCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/AliasCppWriter.scala
index 30ef3407e..23e0f68ac 100644
--- a/compiler/lib/src/main/scala/codegen/CppWriter/AliasCppWriter.scala
+++ b/compiler/lib/src/main/scala/codegen/CppWriter/AliasCppWriter.scala
@@ -120,39 +120,34 @@ case class AliasCppWriter (
       return linesMember(List())
     }
 
-    val systemHHeaders = List(
-      "FpConfig.h"
-    ).map(CppWriter.systemHeaderString).map(line)
-
+    // Include Fw/Types/BasicTypes.h here
+    // To avoid an include cycle, don't depend on Fw/FPrimeBasicTypes.hpp
+    // If the alias refers to one of those types, the header will appear
+    // in symbolHeaders
     val standardHeaders = List(
       "Fw/Types/BasicTypes.h",
     ).map(CppWriter.headerString)
 
     val symbolHeaders = writeHIncludeDirectives(s, aNode)
     val headers = (standardHeaders ++ symbolHeaders).distinct.sorted.map(line)
-    linesMember(List.concat(
-      addBlankPrefix(systemHHeaders),
-      addBlankPrefix(headers)
-    ))
+    linesMember(addBlankPrefix(headers))
   }
 
   private def getHppIncludes: CppDoc.Member.Lines = {
-    val systemHppHeaders = List(
-      "FpConfig.hpp"
-    ).map(CppWriter.systemHeaderString).map(line)
-
     val standardHeaders = List(
+      // Include BasicTypes.h or Fw/Types/String.hpp here
+      // Fw/Types/String.hpp includes Fw/Types/BasicTypes.h
+      // To avoid an include cycle, don't depend on Fw/FPrimeBasicTypes.hpp
+      // If the alias refers to one of those types, the header will appear
+      // in symbolHeaders
       aliasType.aliasType match {
         case Type.String(_) => "Fw/Types/String.hpp"
-        case _ => "Fw/Types/BasicTypes.h"
+        case _ => "Fw/Types/BasicTypes.hpp"
       },
     ).map(CppWriter.headerString)
     val symbolHeaders = writeHppIncludeDirectives(s, aNode)
     val headers = standardHeaders ++ symbolHeaders
-    linesMember(List.concat(
-      addBlankPrefix(systemHppHeaders),
-      addBlankPrefix(headers.distinct.sorted.map(line))
-    ))
+    linesMember(addBlankPrefix(headers.distinct.sorted.map(line)))
   }
 
   private def getHppDefinition: CppDoc.Member.Lines = {
@@ -178,20 +173,24 @@ case class AliasCppWriter (
 
   private def getHDefinition: CppDoc.Member.Lines = {
     val name = s.getName(symbol)
-    def getTypePRI(ty: Type): String = {
-      ty match {
-        case Type.Float(f) => aliasType.aliasType.toString().toLowerCase()
-        case Type.PrimitiveInt(i) => aliasType.aliasType.toString().toLowerCase()
-        case _ => typeCppWriter.write(ty)
-      }
-    }
 
-    val fmtSpec = getTypePRI(aliasType.aliasType)
+    val fmtSpecList = aliasType.aliasType match {
+        // C-style floating-poing format strings (f, g) are platform-independent
+        // In F Prime code, we just use them
+        case Type.Float(f) => Nil
+        // C-style integer format strings (d, u, ld, lu, etc.) are platform-specific
+        // In F Prime code we don't use them. Instead we use a platform-independent macro.
+        // Write out the macro here
+        case _ => List("_" + typeCppWriter.write(aliasType.aliasType))
+      }
 
-    linesMember(addBlankPrefix(
-      AnnotationCppWriter.writePreComment(aNode) ++ lines(
-        s"""|typedef ${typeCppWriter.write(aliasType.aliasType)} $name;
-            |#define PRI_$name PRI_${fmtSpec}""")
-    ))
+    linesMember(
+      addBlankPrefix(
+        AnnotationCppWriter.writePreComment(aNode) ++ (
+          s"typedef ${typeCppWriter.write(aliasType.aliasType)} $name;" ::
+          fmtSpecList.map(s => s"#define PRI_$name PRI$s")
+        ).map(line)
+      )
+    )
   }
 }
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ArrayCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ArrayCppWriter.scala
index 79c245861..c17560d74 100644
--- a/compiler/lib/src/main/scala/codegen/CppWriter/ArrayCppWriter.scala
+++ b/compiler/lib/src/main/scala/codegen/CppWriter/ArrayCppWriter.scala
@@ -87,7 +87,7 @@ case class ArrayCppWriter (
 
   private def getHppIncludes: CppDoc.Member = {
     val standardHeaders = List(
-      "FpConfig.hpp",
+      "Fw/FPrimeBasicTypes.hpp",
       "Fw/Types/ExternalString.hpp",
       "Fw/Types/Serializable.hpp",
       "Fw/Types/String.hpp"
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala
index 4a6e09d28..91ed9c3c0 100644
--- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala
+++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriter.scala
@@ -98,12 +98,13 @@ case class ComponentCppWriter (
     val internalStrHeaders =
       guardedList (hasInternalPorts) (List("Fw/Types/InternalInterfaceString.hpp"))
     val systemHeaders = 
-      ("FpConfig.hpp" :: guardedList (hasEvents) (
+      (guardedList (hasEvents) (
         List("atomic")
       )).map(CppWriter.systemHeaderString).sortBy(_.toLowerCase()).map(line)
     val userHeaders = {
       val standardHeaders = List.concat(
         List(
+          "Fw/FPrimeBasicTypes.hpp",
           "Fw/Port/InputSerializePort.hpp",
           "Fw/Port/OutputSerializePort.hpp",
           "Fw/Comp/ActiveComponentBase.hpp"
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ConstantCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ConstantCppWriter.scala
index 05fa9026b..aab84bb5e 100644
--- a/compiler/lib/src/main/scala/codegen/CppWriter/ConstantCppWriter.scala
+++ b/compiler/lib/src/main/scala/codegen/CppWriter/ConstantCppWriter.scala
@@ -15,7 +15,7 @@ object ConstantCppWriter extends CppWriterUtils {
       case constantMembers => 
         val fileName = ComputeCppFiles.FileNames.getConstants
         val hppHeaderLines = {
-          val headers = List("FpConfig.hpp")
+          val headers = List("Fw/FPrimeBasicTypes.hpp")
           Line.blank :: headers.map(CppWriter.headerLine)
         }
         val cppHeaderLines = {
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala b/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala
index 11a068ed6..1faf5dce5 100644
--- a/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala
+++ b/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterState.scala
@@ -3,7 +3,6 @@ package fpp.compiler.codegen
 import fpp.compiler.analysis._
 import fpp.compiler.ast._
 import fpp.compiler.util._
-import fpp.compiler.codegen.CppWriterState.builtInTypes
 
 /** C++ Writer state */
 case class CppWriterState(
@@ -137,8 +136,7 @@ case class CppWriterState(
       val name = getName(sym)
       for {
         fileName <- sym match {
-          case _: Symbol.AbsType =>
-              if isBuiltInType(name) then None else Some(name)
+          case _: Symbol.AbsType => Some(name)
           case _: Symbol.AliasType => Some(
             ComputeCppFiles.FileNames.getAliasType(name)
           )
@@ -172,9 +170,6 @@ case class CppWriterState(
     usedSymbols.map(getIncludeFiles).filter(_.isDefined).map(_.get).map(CppWriterState.headerString).toList
   }
 
-  /** Is t a built-in type? */
-  def isBuiltInType(typeName: String): Boolean = builtInTypes.contains(typeName)
-
   def isTypeSupportedInC(t: Type): Boolean = {
     t match {
       case Type.AliasType(node, aliasType) =>
@@ -184,7 +179,6 @@ case class CppWriterState(
           // Make sure all types in the alias chain meet the C requirements
           case None => isTypeSupportedInC(aliasType)
         }
-      case Type.AbsType(node) => isBuiltInType(getName(Symbol.AbsType(node)))
       case Type.PrimitiveInt(_) => true
       case Type.Float(_) => true
       case _ => false
@@ -192,12 +186,7 @@ case class CppWriterState(
   }
 
   /** Is t a primitive type (not serializable)? */
-  def isPrimitive(t: Type, typeName: String): Boolean  = (
-    isBuiltInType(typeName) ||
-    t.getUnderlyingType.isPrimitive ||
-    // See if this an alias of a builtin type
-    isBuiltInType(t.getUnderlyingType.toString())
-  )
+  def isPrimitive(t: Type, typeName: String): Boolean  = t.getUnderlyingType.isPrimitive
 
   /** Is t a string type? */
   def isStringType(t: Type) = t.getUnderlyingType match {
@@ -212,28 +201,6 @@ object CppWriterState {
   /** The default default string size */
   val defaultDefaultStringSize = 80
 
-  /** A mapping from special built-in types to their
-   *  default values */
-  val zero: Value.Integer = Value.Integer(0)
-  val builtInTypes: Map[String,Value.Integer] = Map(
-    "FwChanIdType" -> zero,
-    "FwDpIdType" -> zero,
-    "FwDpPriorityType" -> zero,
-    "FwEnumStoreType" -> zero,
-    "FwEventIdType" -> zero,
-    "FwIndexType" -> zero,
-    "FwOpcodeType" -> zero,
-    "FwPacketDescriptorType" -> zero,
-    "FwPrmIdType" -> zero,
-    "FwSignedSizeType" -> zero,
-    "FwSizeStoreType" -> zero,
-    "FwSizeType" -> zero,
-    "FwTimeBaseStoreType" -> zero,
-    "FwTimeContextStoreType" -> zero,
-    "FwTlmPacketizeIdType" -> zero,
-    "FwTraceIdType" -> zero,
-  )
-
   /** Construct a header string */
   def headerString(s: String): String = {
     val q = "\""
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala b/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala
index 5e84cbddf..6905adca5 100644
--- a/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala
+++ b/compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala
@@ -6,19 +6,18 @@ import fpp.compiler.analysis._
 trait CppWriterUtils extends LineUtils {
 
   /** Standard system hpp headers */
-  val standardSystemHppHeaders = List(
-    "FpConfig.hpp"
-  ).map(CppWriter.systemHeaderString)
+  val standardSystemHppHeaders = Nil.map(CppWriter.systemHeaderString)
 
   /** Standard user hpp headers */
   val standardUserHppHeaders = List(
+    "Fw/FPrimeBasicTypes.hpp",
     "Fw/Types/ExternalString.hpp",
     "Fw/Types/Serializable.hpp",
     "Fw/Types/String.hpp"
   ).map(CppWriter.headerString)
 
   /** Standard system cpp headers */
-  val standardSystemCppHeaders = Nil
+  val standardSystemCppHeaders = Nil.map(CppWriter.systemHeaderString)
 
   /** Standard user cpp headers */
   val standardUserCppHeaders = List(
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/EnumCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/EnumCppWriter.scala
index 981c43125..ba08b59e4 100644
--- a/compiler/lib/src/main/scala/codegen/CppWriter/EnumCppWriter.scala
+++ b/compiler/lib/src/main/scala/codegen/CppWriter/EnumCppWriter.scala
@@ -83,7 +83,7 @@ case class EnumCppWriter(
 
   private def getHppIncludes: CppDoc.Member = {
     val strings = List(
-      "FpConfig.hpp",
+      "Fw/FPrimeBasicTypes.hpp",
       "Fw/Types/Serializable.hpp",
       "Fw/Types/String.hpp"
     )
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/PortCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/PortCppWriter.scala
index 0f2306375..8ef3279e7 100644
--- a/compiler/lib/src/main/scala/codegen/CppWriter/PortCppWriter.scala
+++ b/compiler/lib/src/main/scala/codegen/CppWriter/PortCppWriter.scala
@@ -122,8 +122,7 @@ case class PortCppWriter (
   private def getHppIncludes: CppDoc.Member = {
     val systemHeaders = List(
       "cstdio",
-      "cstring",
-      "FpConfig.hpp"
+      "cstring"
     ).map(CppWriter.systemHeaderString).map(line)
     val serializableHeader = data.returnType match {
       case Some(_) => Nil
@@ -131,6 +130,7 @@ case class PortCppWriter (
     }
     val standardHeaders = (
       List(
+        "Fw/FPrimeBasicTypes.hpp",
         "Fw/Comp/PassiveComponentBase.hpp",
         "Fw/Port/InputPortBase.hpp",
         "Fw/Port/OutputPortBase.hpp",
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/StructCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/StructCppWriter.scala
index 1974ad089..428417e07 100644
--- a/compiler/lib/src/main/scala/codegen/CppWriter/StructCppWriter.scala
+++ b/compiler/lib/src/main/scala/codegen/CppWriter/StructCppWriter.scala
@@ -100,7 +100,7 @@ case class StructCppWriter(
 
   private def getHppIncludes: CppDoc.Member = {
     val userHeaders = List(
-      "FpConfig.hpp",
+      "Fw/FPrimeBasicTypes.hpp",
       "Fw/Types/ExternalString.hpp",
       "Fw/Types/Serializable.hpp",
       "Fw/Types/String.hpp"
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ValueCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ValueCppWriter.scala
index 5b9e88df4..d6423bd92 100644
--- a/compiler/lib/src/main/scala/codegen/CppWriter/ValueCppWriter.scala
+++ b/compiler/lib/src/main/scala/codegen/CppWriter/ValueCppWriter.scala
@@ -15,11 +15,7 @@ object ValueCppWriter {
 
     override def absType(s: CppWriterState, v: Value.AbsType) = {
       val aNode = v.t.node
-      val cppName = s.writeSymbol(Symbol.AbsType(aNode))
-      CppWriterState.builtInTypes.get(cppName) match {
-        case Some(v) => write(s, v)
-        case None => TypeCppWriter.getName(s, v.getType) ++ "()"
-      }
+      TypeCppWriter.getName(s, v.getType) ++ "()"
     }
 
     override def array(s: CppWriterState, v: Value.Array) = {
diff --git a/compiler/lib/src/main/scala/codegen/XmlWriter/XmlWriterState.scala b/compiler/lib/src/main/scala/codegen/XmlWriter/XmlWriterState.scala
index 753f25cc6..34b29c8c3 100644
--- a/compiler/lib/src/main/scala/codegen/XmlWriter/XmlWriterState.scala
+++ b/compiler/lib/src/main/scala/codegen/XmlWriter/XmlWriterState.scala
@@ -31,13 +31,8 @@ case class XmlWriterState(
         tagFileName <- sym match {
           case Symbol.AbsType(aNode) => 
             val symbol = Symbol.AbsType(aNode)
-            // Don't import headers for built-in types
-            val cppName = writeSymbol(symbol)
-            if (CppWriterState.builtInTypes.contains(cppName)) None
-            else {
-              val name = getName(symbol)
-              Some("include_header", s"${name}.hpp")
-            }
+            val name = getName(symbol)
+            Some("include_header", s"${name}.hpp")
           case Symbol.Array(aNode) => Some(
             "import_array_type",
             XmlWriterState.getArrayFileName(getName(Symbol.Array(aNode)))
diff --git a/compiler/scripts/fprime-gcc b/compiler/scripts/fprime-gcc
index eef005b2f..57ccd948d 100755
--- a/compiler/scripts/fprime-gcc
+++ b/compiler/scripts/fprime-gcc
@@ -43,4 +43,13 @@ case "$os" in
     ;;
 esac
 
-g++ --std=c++11 $flags $os_flags -DTGT_OS_TYPE_$os_type -I $FPRIME -I $FPRIME/config -I $FPRIME/cmake/platform/types -I . $FPRIME_GCC_FLAGS $@
+g++ --std=c++11 \
+  $flags \
+  $os_flags \
+  -DTGT_OS_TYPE_$os_type \
+  -I $FPRIME \
+  -I $FPRIME/config \
+  -I $FPRIME/cmake/platform/types \
+  -I . \
+  $FPRIME_GCC_FLAGS \
+  $@
diff --git a/compiler/tools/fpp-depend/test/filenames_auto_generated_output.ref.txt b/compiler/tools/fpp-depend/test/filenames_auto_generated_output.ref.txt
index 2066b5f0b..bdabcd91d 100644
--- a/compiler/tools/fpp-depend/test/filenames_auto_generated_output.ref.txt
+++ b/compiler/tools/fpp-depend/test/filenames_auto_generated_output.ref.txt
@@ -18,6 +18,7 @@ EEnumAc.hpp
 EEnumAi.xml
 FppConstantsAc.cpp
 FppConstantsAc.hpp
+FwOpcodeTypeAliasAc.hpp
 PPortAc.cpp
 PPortAc.hpp
 PPortAi.xml
diff --git a/compiler/tools/fpp-depend/test/filenames_generated_output.ref.txt b/compiler/tools/fpp-depend/test/filenames_generated_output.ref.txt
index 2066b5f0b..bdabcd91d 100644
--- a/compiler/tools/fpp-depend/test/filenames_generated_output.ref.txt
+++ b/compiler/tools/fpp-depend/test/filenames_generated_output.ref.txt
@@ -18,6 +18,7 @@ EEnumAc.hpp
 EEnumAi.xml
 FppConstantsAc.cpp
 FppConstantsAc.hpp
+FwOpcodeTypeAliasAc.hpp
 PPortAc.cpp
 PPortAc.hpp
 PPortAi.xml
diff --git a/compiler/tools/fpp-depend/test/filenames_include_auto_generated_output.ref.txt b/compiler/tools/fpp-depend/test/filenames_include_auto_generated_output.ref.txt
index 2066b5f0b..bdabcd91d 100644
--- a/compiler/tools/fpp-depend/test/filenames_include_auto_generated_output.ref.txt
+++ b/compiler/tools/fpp-depend/test/filenames_include_auto_generated_output.ref.txt
@@ -18,6 +18,7 @@ EEnumAc.hpp
 EEnumAi.xml
 FppConstantsAc.cpp
 FppConstantsAc.hpp
+FwOpcodeTypeAliasAc.hpp
 PPortAc.cpp
 PPortAc.hpp
 PPortAi.xml
diff --git a/compiler/tools/fpp-depend/test/filenames_include_generated_output.ref.txt b/compiler/tools/fpp-depend/test/filenames_include_generated_output.ref.txt
index 2066b5f0b..bdabcd91d 100644
--- a/compiler/tools/fpp-depend/test/filenames_include_generated_output.ref.txt
+++ b/compiler/tools/fpp-depend/test/filenames_include_generated_output.ref.txt
@@ -18,6 +18,7 @@ EEnumAc.hpp
 EEnumAi.xml
 FppConstantsAc.cpp
 FppConstantsAc.hpp
+FwOpcodeTypeAliasAc.hpp
 PPortAc.cpp
 PPortAc.hpp
 PPortAi.xml
diff --git a/compiler/tools/fpp-filenames/test/include.ref.txt b/compiler/tools/fpp-filenames/test/include.ref.txt
index 2066b5f0b..bdabcd91d 100644
--- a/compiler/tools/fpp-filenames/test/include.ref.txt
+++ b/compiler/tools/fpp-filenames/test/include.ref.txt
@@ -18,6 +18,7 @@ EEnumAc.hpp
 EEnumAi.xml
 FppConstantsAc.cpp
 FppConstantsAc.hpp
+FwOpcodeTypeAliasAc.hpp
 PPortAc.cpp
 PPortAc.hpp
 PPortAi.xml
diff --git a/compiler/tools/fpp-filenames/test/ok.fpp b/compiler/tools/fpp-filenames/test/ok.fpp
index 6355fc77a..1d6707079 100644
--- a/compiler/tools/fpp-filenames/test/ok.fpp
+++ b/compiler/tools/fpp-filenames/test/ok.fpp
@@ -10,7 +10,7 @@ state machine SM2 {
   state S
 }
 
-type FwOpcodeType
+type FwOpcodeType = U32
 type WithCDefinition = U32
 type WithCDefinitionBuiltin = FwOpcodeType
 type WithoutCDefinition = A
diff --git a/compiler/tools/fpp-filenames/test/ok.ref.txt b/compiler/tools/fpp-filenames/test/ok.ref.txt
index 2066b5f0b..bdabcd91d 100644
--- a/compiler/tools/fpp-filenames/test/ok.ref.txt
+++ b/compiler/tools/fpp-filenames/test/ok.ref.txt
@@ -18,6 +18,7 @@ EEnumAc.hpp
 EEnumAi.xml
 FppConstantsAc.cpp
 FppConstantsAc.hpp
+FwOpcodeTypeAliasAc.hpp
 PPortAc.cpp
 PPortAc.hpp
 PPortAi.xml
diff --git a/compiler/tools/fpp-to-cpp/test/alias/AbsSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/AbsSerializableAc.ref.hpp
index dcbb898e4..0f3efa1e8 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/AbsSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/alias/AbsSerializableAc.ref.hpp
@@ -8,7 +8,7 @@
 #define AbsSerializableAc_HPP
 
 #include "AbsTypeAliasAc.hpp"
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/alias/AbsTypeAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/AbsTypeAliasAc.ref.hpp
index 97079c286..40b425813 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/AbsTypeAliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/alias/AbsTypeAliasAc.ref.hpp
@@ -7,9 +7,7 @@
 #ifndef AbsTypeAliasAc_HPP
 #define AbsTypeAliasAc_HPP
 
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 #include "T.hpp"
 
 //! An alias of abstract type
diff --git a/compiler/tools/fpp-to-cpp/test/alias/BasicSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/BasicSerializableAc.ref.hpp
index 176ded9c3..41a5ec07b 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/BasicSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/alias/BasicSerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef BasicSerializableAc_HPP
 #define BasicSerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/alias/BuiltInTypeAliasAc.ref.h b/compiler/tools/fpp-to-cpp/test/alias/BuiltInTypeAliasAc.ref.h
deleted file mode 100644
index 29d8ad054..000000000
--- a/compiler/tools/fpp-to-cpp/test/alias/BuiltInTypeAliasAc.ref.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// ======================================================================
-// \title  BuiltInTypeAliasAc.h
-// \author Generated by fpp-to-cpp
-// \brief  h file for BuiltInType alias
-// ======================================================================
-
-#ifndef BuiltInTypeAliasAc_H
-#define BuiltInTypeAliasAc_H
-
-#include <FpConfig.h>
-
-#include "Fw/Types/BasicTypes.h"
-
-//! An alias of a built-in type
-typedef FwOpcodeType BuiltInType;
-#define PRI_BuiltInType PRI_FwOpcodeType
-
-#endif
diff --git a/compiler/tools/fpp-to-cpp/test/alias/BuiltInTypeAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/BuiltInTypeAliasAc.ref.hpp
deleted file mode 100644
index 340dc385e..000000000
--- a/compiler/tools/fpp-to-cpp/test/alias/BuiltInTypeAliasAc.ref.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// ======================================================================
-// \title  BuiltInTypeAliasAc.hpp
-// \author Generated by fpp-to-cpp
-// \brief  hpp file for BuiltInType alias
-// ======================================================================
-
-#ifndef BuiltInTypeAliasAc_HPP
-#define BuiltInTypeAliasAc_HPP
-
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
-
-extern "C" {
-#include "BuiltInTypeAliasAc.h"
-}
-
-#endif
diff --git a/compiler/tools/fpp-to-cpp/test/alias/BuiltinSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/alias/BuiltinSerializableAc.ref.cpp
deleted file mode 100644
index 339383b5f..000000000
--- a/compiler/tools/fpp-to-cpp/test/alias/BuiltinSerializableAc.ref.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-// ======================================================================
-// \title  BuiltinSerializableAc.cpp
-// \author Generated by fpp-to-cpp
-// \brief  cpp file for Builtin struct
-// ======================================================================
-
-#include "BuiltinSerializableAc.hpp"
-#include "Fw/Types/Assert.hpp"
-
-// ----------------------------------------------------------------------
-// Constructors
-// ----------------------------------------------------------------------
-
-Builtin ::
-  Builtin() :
-    Serializable(),
-    m_A(),
-    m_B(),
-    m_C()
-{
-
-}
-
-Builtin ::
-  Builtin(
-      BuiltInType A,
-      M::NamespacedBuiltin1 B,
-      M::NamespacedBuiltin2 C
-  ) :
-    Serializable(),
-    m_A(A),
-    m_B(B),
-    m_C(C)
-{
-
-}
-
-Builtin ::
-  Builtin(const Builtin& obj) :
-    Serializable(),
-    m_A(obj.m_A),
-    m_B(obj.m_B),
-    m_C(obj.m_C)
-{
-
-}
-
-// ----------------------------------------------------------------------
-// Operators
-// ----------------------------------------------------------------------
-
-Builtin& Builtin ::
-  operator=(const Builtin& obj)
-{
-  if (this == &obj) {
-    return *this;
-  }
-
-  set(obj.m_A, obj.m_B, obj.m_C);
-  return *this;
-}
-
-bool Builtin ::
-  operator==(const Builtin& obj) const
-{
-  if (this == &obj) { return true; }
-  return (
-    (this->m_A == obj.m_A) &&
-    (this->m_B == obj.m_B) &&
-    (this->m_C == obj.m_C)
-  );
-}
-
-bool Builtin ::
-  operator!=(const Builtin& obj) const
-{
-  return !(*this == obj);
-}
-
-#ifdef BUILD_UT
-
-std::ostream& operator<<(std::ostream& os, const Builtin& obj) {
-  Fw::String s;
-  obj.toString(s);
-  os << s.toChar();
-  return os;
-}
-
-#endif
-
-// ----------------------------------------------------------------------
-// Member functions
-// ----------------------------------------------------------------------
-
-Fw::SerializeStatus Builtin ::
-  serialize(Fw::SerializeBufferBase& buffer) const
-{
-  Fw::SerializeStatus status;
-
-  status = buffer.serialize(this->m_A);
-  if (status != Fw::FW_SERIALIZE_OK) {
-    return status;
-  }
-  status = buffer.serialize(this->m_B);
-  if (status != Fw::FW_SERIALIZE_OK) {
-    return status;
-  }
-  status = buffer.serialize(this->m_C);
-  if (status != Fw::FW_SERIALIZE_OK) {
-    return status;
-  }
-
-  return status;
-}
-
-Fw::SerializeStatus Builtin ::
-  deserialize(Fw::SerializeBufferBase& buffer)
-{
-  Fw::SerializeStatus status;
-
-  status = buffer.deserialize(this->m_A);
-  if (status != Fw::FW_SERIALIZE_OK) {
-    return status;
-  }
-  status = buffer.deserialize(this->m_B);
-  if (status != Fw::FW_SERIALIZE_OK) {
-    return status;
-  }
-  status = buffer.deserialize(this->m_C);
-  if (status != Fw::FW_SERIALIZE_OK) {
-    return status;
-  }
-
-  return status;
-}
-
-#if FW_SERIALIZABLE_TO_STRING
-
-void Builtin ::
-  toString(Fw::StringBase& sb) const
-{
-  static const char* formatString =
-    "( "
-    "A = %s, "
-    "B = %s, "
-    "C = %s"
-    " )";
-
-  sb.format(
-    formatString,
-    this->m_A,
-    this->m_B,
-    this->m_C
-  );
-}
-
-#endif
-
-// ----------------------------------------------------------------------
-// Setter functions
-// ----------------------------------------------------------------------
-
-void Builtin ::
-  set(
-      BuiltInType A,
-      M::NamespacedBuiltin1 B,
-      M::NamespacedBuiltin2 C
-  )
-{
-  this->m_A = A;
-  this->m_B = B;
-  this->m_C = C;
-}
-
-void Builtin ::
-  setA(BuiltInType A)
-{
-  this->m_A = A;
-}
-
-void Builtin ::
-  setB(M::NamespacedBuiltin1 B)
-{
-  this->m_B = B;
-}
-
-void Builtin ::
-  setC(M::NamespacedBuiltin2 C)
-{
-  this->m_C = C;
-}
diff --git a/compiler/tools/fpp-to-cpp/test/alias/BuiltinSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/BuiltinSerializableAc.ref.hpp
deleted file mode 100644
index dbc852b4c..000000000
--- a/compiler/tools/fpp-to-cpp/test/alias/BuiltinSerializableAc.ref.hpp
+++ /dev/null
@@ -1,167 +0,0 @@
-// ======================================================================
-// \title  BuiltinSerializableAc.hpp
-// \author Generated by fpp-to-cpp
-// \brief  hpp file for Builtin struct
-// ======================================================================
-
-#ifndef BuiltinSerializableAc_HPP
-#define BuiltinSerializableAc_HPP
-
-#include "BuiltInTypeAliasAc.hpp"
-#include "FpConfig.hpp"
-#include "Fw/Types/ExternalString.hpp"
-#include "Fw/Types/Serializable.hpp"
-#include "Fw/Types/String.hpp"
-#include "NamespacedBuiltin1AliasAc.hpp"
-#include "NamespacedBuiltin2AliasAc.hpp"
-
-class Builtin :
-  public Fw::Serializable
-{
-
-  public:
-
-    // ----------------------------------------------------------------------
-    // Constants
-    // ----------------------------------------------------------------------
-
-    enum {
-      //! The size of the serial representation
-      SERIALIZED_SIZE =
-        sizeof(BuiltInType) +
-        sizeof(M::NamespacedBuiltin1) +
-        sizeof(M::NamespacedBuiltin2)
-    };
-
-  public:
-
-    // ----------------------------------------------------------------------
-    // Constructors
-    // ----------------------------------------------------------------------
-
-    //! Constructor (default value)
-    Builtin();
-
-    //! Member constructor
-    Builtin(
-        BuiltInType A,
-        M::NamespacedBuiltin1 B,
-        M::NamespacedBuiltin2 C
-    );
-
-    //! Copy constructor
-    Builtin(
-        const Builtin& obj //!< The source object
-    );
-
-  public:
-
-    // ----------------------------------------------------------------------
-    // Operators
-    // ----------------------------------------------------------------------
-
-    //! Copy assignment operator
-    Builtin& operator=(
-        const Builtin& obj //!< The source object
-    );
-
-    //! Equality operator
-    bool operator==(
-        const Builtin& obj //!< The other object
-    ) const;
-
-    //! Inequality operator
-    bool operator!=(
-        const Builtin& obj //!< The other object
-    ) const;
-
-#ifdef BUILD_UT
-
-    //! Ostream operator
-    friend std::ostream& operator<<(
-        std::ostream& os, //!< The ostream
-        const Builtin& obj //!< The object
-    );
-
-#endif
-
-  public:
-
-    // ----------------------------------------------------------------------
-    // Member functions
-    // ----------------------------------------------------------------------
-
-    //! Serialization
-    Fw::SerializeStatus serialize(
-        Fw::SerializeBufferBase& buffer //!< The serial buffer
-    ) const;
-
-    //! Deserialization
-    Fw::SerializeStatus deserialize(
-        Fw::SerializeBufferBase& buffer //!< The serial buffer
-    );
-
-#if FW_SERIALIZABLE_TO_STRING
-
-    //! Convert struct to string
-    void toString(
-        Fw::StringBase& sb //!< The StringBase object to hold the result
-    ) const;
-
-#endif
-
-    // ----------------------------------------------------------------------
-    // Getter functions
-    // ----------------------------------------------------------------------
-
-    //! Get member A
-    BuiltInType getA() const
-    {
-      return this->m_A;
-    }
-
-    //! Get member B
-    M::NamespacedBuiltin1 getB() const
-    {
-      return this->m_B;
-    }
-
-    //! Get member C
-    M::NamespacedBuiltin2 getC() const
-    {
-      return this->m_C;
-    }
-
-    // ----------------------------------------------------------------------
-    // Setter functions
-    // ----------------------------------------------------------------------
-
-    //! Set all members
-    void set(
-        BuiltInType A,
-        M::NamespacedBuiltin1 B,
-        M::NamespacedBuiltin2 C
-    );
-
-    //! Set member A
-    void setA(BuiltInType A);
-
-    //! Set member B
-    void setB(M::NamespacedBuiltin1 B);
-
-    //! Set member C
-    void setC(M::NamespacedBuiltin2 C);
-
-  protected:
-
-    // ----------------------------------------------------------------------
-    // Member variables
-    // ----------------------------------------------------------------------
-
-    BuiltInType m_A;
-    M::NamespacedBuiltin1 m_B;
-    M::NamespacedBuiltin2 m_C;
-
-};
-
-#endif
diff --git a/compiler/tools/fpp-to-cpp/test/alias/NamespaceSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/NamespaceSerializableAc.ref.hpp
index d9af64bfb..33ee752db 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/NamespaceSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/alias/NamespaceSerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef NamespaceSerializableAc_HPP
 #define NamespaceSerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/alias/NamespacedAliasType2AliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/NamespacedAliasType2AliasAc.ref.hpp
index 9ec75d66e..8eeac4ec0 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/NamespacedAliasType2AliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/alias/NamespacedAliasType2AliasAc.ref.hpp
@@ -7,9 +7,7 @@
 #ifndef M_NamespacedAliasType2AliasAc_HPP
 #define M_NamespacedAliasType2AliasAc_HPP
 
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 #include "NamespacedAliasTypeAliasAc.hpp"
 
 namespace M {
diff --git a/compiler/tools/fpp-to-cpp/test/alias/NamespacedAliasTypeAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/NamespacedAliasTypeAliasAc.ref.hpp
index 2388885e6..f06805267 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/NamespacedAliasTypeAliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/alias/NamespacedAliasTypeAliasAc.ref.hpp
@@ -7,9 +7,7 @@
 #ifndef M_M2_NamespacedAliasTypeAliasAc_HPP
 #define M_M2_NamespacedAliasTypeAliasAc_HPP
 
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 #include "SimpleCType2AliasAc.hpp"
 
 namespace M {
diff --git a/compiler/tools/fpp-to-cpp/test/alias/NamespacedBuiltin1AliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/NamespacedBuiltin1AliasAc.ref.hpp
deleted file mode 100644
index af7b716f0..000000000
--- a/compiler/tools/fpp-to-cpp/test/alias/NamespacedBuiltin1AliasAc.ref.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// ======================================================================
-// \title  NamespacedBuiltin1AliasAc.hpp
-// \author Generated by fpp-to-cpp
-// \brief  hpp file for NamespacedBuiltin1 alias
-// ======================================================================
-
-#ifndef M_NamespacedBuiltin1AliasAc_HPP
-#define M_NamespacedBuiltin1AliasAc_HPP
-
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
-
-namespace M {
-
-  using NamespacedBuiltin1 = FwOpcodeType;
-
-}
-
-#endif
diff --git a/compiler/tools/fpp-to-cpp/test/alias/NamespacedBuiltin2AliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/NamespacedBuiltin2AliasAc.ref.hpp
deleted file mode 100644
index 19b11c5a7..000000000
--- a/compiler/tools/fpp-to-cpp/test/alias/NamespacedBuiltin2AliasAc.ref.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// ======================================================================
-// \title  NamespacedBuiltin2AliasAc.hpp
-// \author Generated by fpp-to-cpp
-// \brief  hpp file for NamespacedBuiltin2 alias
-// ======================================================================
-
-#ifndef M_NamespacedBuiltin2AliasAc_HPP
-#define M_NamespacedBuiltin2AliasAc_HPP
-
-#include <FpConfig.hpp>
-
-#include "BuiltInTypeAliasAc.hpp"
-#include "Fw/Types/BasicTypes.h"
-
-namespace M {
-
-  using NamespacedBuiltin2 = BuiltInType;
-
-}
-
-#endif
diff --git a/compiler/tools/fpp-to-cpp/test/alias/SimpleCType2AliasAc.ref.h b/compiler/tools/fpp-to-cpp/test/alias/SimpleCType2AliasAc.ref.h
index 702e16ffa..0a20c5fb1 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/SimpleCType2AliasAc.ref.h
+++ b/compiler/tools/fpp-to-cpp/test/alias/SimpleCType2AliasAc.ref.h
@@ -7,8 +7,6 @@
 #ifndef SimpleCType2AliasAc_H
 #define SimpleCType2AliasAc_H
 
-#include <FpConfig.h>
-
 #include "Fw/Types/BasicTypes.h"
 #include "SimpleCTypeAliasAc.h"
 
diff --git a/compiler/tools/fpp-to-cpp/test/alias/SimpleCType2AliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/SimpleCType2AliasAc.ref.hpp
index efefff671..f0c98d761 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/SimpleCType2AliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/alias/SimpleCType2AliasAc.ref.hpp
@@ -7,9 +7,7 @@
 #ifndef SimpleCType2AliasAc_HPP
 #define SimpleCType2AliasAc_HPP
 
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 #include "SimpleCTypeAliasAc.hpp"
 
 extern "C" {
diff --git a/compiler/tools/fpp-to-cpp/test/alias/SimpleCTypeAliasAc.ref.h b/compiler/tools/fpp-to-cpp/test/alias/SimpleCTypeAliasAc.ref.h
index 17db94cfd..84f90cf0c 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/SimpleCTypeAliasAc.ref.h
+++ b/compiler/tools/fpp-to-cpp/test/alias/SimpleCTypeAliasAc.ref.h
@@ -7,12 +7,10 @@
 #ifndef SimpleCTypeAliasAc_H
 #define SimpleCTypeAliasAc_H
 
-#include <FpConfig.h>
-
 #include "Fw/Types/BasicTypes.h"
 
 //! A simple type alias that supports C codegen
 typedef U32 SimpleCType;
-#define PRI_SimpleCType PRI_u32
+#define PRI_SimpleCType PRI_U32
 
 #endif
diff --git a/compiler/tools/fpp-to-cpp/test/alias/SimpleCTypeAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/SimpleCTypeAliasAc.ref.hpp
index a126bcd3a..6d6908079 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/SimpleCTypeAliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/alias/SimpleCTypeAliasAc.ref.hpp
@@ -7,9 +7,7 @@
 #ifndef SimpleCTypeAliasAc_HPP
 #define SimpleCTypeAliasAc_HPP
 
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 
 extern "C" {
 #include "SimpleCTypeAliasAc.h"
diff --git a/compiler/tools/fpp-to-cpp/test/alias/TF32AliasAc.ref.h b/compiler/tools/fpp-to-cpp/test/alias/TF32AliasAc.ref.h
index 293b0886e..b3ce3e00f 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/TF32AliasAc.ref.h
+++ b/compiler/tools/fpp-to-cpp/test/alias/TF32AliasAc.ref.h
@@ -7,11 +7,8 @@
 #ifndef TF32AliasAc_H
 #define TF32AliasAc_H
 
-#include <FpConfig.h>
-
 #include "Fw/Types/BasicTypes.h"
 
 typedef F32 TF32;
-#define PRI_TF32 PRI_f32
 
 #endif
diff --git a/compiler/tools/fpp-to-cpp/test/alias/TF32AliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/TF32AliasAc.ref.hpp
index b1f543864..63c0e62db 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/TF32AliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/alias/TF32AliasAc.ref.hpp
@@ -7,9 +7,7 @@
 #ifndef TF32AliasAc_HPP
 #define TF32AliasAc_HPP
 
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 
 extern "C" {
 #include "TF32AliasAc.h"
diff --git a/compiler/tools/fpp-to-cpp/test/alias/TStringAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/TStringAliasAc.ref.hpp
index 6dbbaa847..fcd8d9096 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/TStringAliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/alias/TStringAliasAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef TStringAliasAc_HPP
 #define TStringAliasAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Types/String.hpp"
 
 using TString = Fw::String;
diff --git a/compiler/tools/fpp-to-cpp/test/alias/TStringSizeAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/TStringSizeAliasAc.ref.hpp
index 1cd784a24..9a7995023 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/TStringSizeAliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/alias/TStringSizeAliasAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef TStringSizeAliasAc_HPP
 #define TStringSizeAliasAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Types/String.hpp"
 
 using TStringSize = Fw::String;
diff --git a/compiler/tools/fpp-to-cpp/test/alias/TU32AliasAc.ref.h b/compiler/tools/fpp-to-cpp/test/alias/TU32AliasAc.ref.h
index df81846a1..3fd15ad13 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/TU32AliasAc.ref.h
+++ b/compiler/tools/fpp-to-cpp/test/alias/TU32AliasAc.ref.h
@@ -7,11 +7,9 @@
 #ifndef TU32AliasAc_H
 #define TU32AliasAc_H
 
-#include <FpConfig.h>
-
 #include "Fw/Types/BasicTypes.h"
 
 typedef U32 TU32;
-#define PRI_TU32 PRI_u32
+#define PRI_TU32 PRI_U32
 
 #endif
diff --git a/compiler/tools/fpp-to-cpp/test/alias/TU32AliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/alias/TU32AliasAc.ref.hpp
index 1f7715010..6a42f9da6 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/TU32AliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/alias/TU32AliasAc.ref.hpp
@@ -7,9 +7,7 @@
 #ifndef TU32AliasAc_HPP
 #define TU32AliasAc_HPP
 
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 
 extern "C" {
 #include "TU32AliasAc.h"
diff --git a/compiler/tools/fpp-to-cpp/test/alias/builtin_type.fpp b/compiler/tools/fpp-to-cpp/test/alias/builtin_type.fpp
deleted file mode 100644
index 5dfa8d2ef..000000000
--- a/compiler/tools/fpp-to-cpp/test/alias/builtin_type.fpp
+++ /dev/null
@@ -1,15 +0,0 @@
-type FwOpcodeType
-
-@ An alias of a built-in type
-type BuiltInType = FwOpcodeType
-
-module M {
-    type NamespacedBuiltin1 = FwOpcodeType
-    type NamespacedBuiltin2 = BuiltInType
-}
-
-struct Builtin {
-    A: BuiltInType,
-    B: M.NamespacedBuiltin1,
-    C: M.NamespacedBuiltin2,
-}
diff --git a/compiler/tools/fpp-to-cpp/test/alias/builtin_type.ref.txt b/compiler/tools/fpp-to-cpp/test/alias/builtin_type.ref.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/compiler/tools/fpp-to-cpp/test/alias/run.sh b/compiler/tools/fpp-to-cpp/test/alias/run.sh
index 78740d475..232fbc06b 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/run.sh
+++ b/compiler/tools/fpp-to-cpp/test/alias/run.sh
@@ -15,15 +15,6 @@ basic()
     diff_cpp BasicSerializable
 }
 
-builtin_type()
-{
-  run_test "-p $PWD" builtin_type && \
-    diff_h_hpp BuiltInTypeAlias && \
-    diff_hpp NamespacedBuiltin1Alias && \
-    diff_hpp NamespacedBuiltin2Alias && \
-    diff_cpp BuiltinSerializable
-}
-
 namespace()
 {
   run_test "-p $PWD" namespace && \
diff --git a/compiler/tools/fpp-to-cpp/test/alias/tests.sh b/compiler/tools/fpp-to-cpp/test/alias/tests.sh
index 844e307f1..5a255ba2b 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/tests.sh
+++ b/compiler/tools/fpp-to-cpp/test/alias/tests.sh
@@ -1,6 +1,5 @@
 tests="
 abs_type
 basic
-builtin_type
 namespace
 "
diff --git a/compiler/tools/fpp-to-cpp/test/alias/update-ref.sh b/compiler/tools/fpp-to-cpp/test/alias/update-ref.sh
index d8a13f296..841a73b29 100644
--- a/compiler/tools/fpp-to-cpp/test/alias/update-ref.sh
+++ b/compiler/tools/fpp-to-cpp/test/alias/update-ref.sh
@@ -15,15 +15,6 @@ basic()
   move_cpp BasicSerializable
 }
 
-builtin_type()
-{
-  update "-p $PWD" builtin_type
-  move_h_hpp BuiltInTypeAlias
-  move_hpp NamespacedBuiltin1Alias
-  move_hpp NamespacedBuiltin2Alias
-  move_cpp BuiltinSerializable
-}
-
 namespace()
 {
   update "-p $PWD" namespace
diff --git a/compiler/tools/fpp-to-cpp/test/array/AArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/AArrayAc.ref.hpp
index d00e35938..bbf75ad8a 100644
--- a/compiler/tools/fpp-to-cpp/test/array/AArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/AArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef AArrayAc_HPP
 #define AArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/ATAliasAc.ref.h b/compiler/tools/fpp-to-cpp/test/array/ATAliasAc.ref.h
index e74220e22..a841cf958 100644
--- a/compiler/tools/fpp-to-cpp/test/array/ATAliasAc.ref.h
+++ b/compiler/tools/fpp-to-cpp/test/array/ATAliasAc.ref.h
@@ -7,11 +7,9 @@
 #ifndef ATAliasAc_H
 #define ATAliasAc_H
 
-#include <FpConfig.h>
-
 #include "Fw/Types/BasicTypes.h"
 
 typedef U32 AT;
-#define PRI_AT PRI_u32
+#define PRI_AT PRI_U32
 
 #endif
diff --git a/compiler/tools/fpp-to-cpp/test/array/ATAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/ATAliasAc.ref.hpp
index 3a5c0d98c..cce266570 100644
--- a/compiler/tools/fpp-to-cpp/test/array/ATAliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/ATAliasAc.ref.hpp
@@ -7,9 +7,7 @@
 #ifndef ATAliasAc_HPP
 #define ATAliasAc_HPP
 
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 
 extern "C" {
 #include "ATAliasAc.h"
diff --git a/compiler/tools/fpp-to-cpp/test/array/AbsTypeArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/AbsTypeArrayAc.ref.hpp
index 9be0705a6..0bac4a0df 100644
--- a/compiler/tools/fpp-to-cpp/test/array/AbsTypeArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/AbsTypeArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef AbsTypeArrayAc_HPP
 #define AbsTypeArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/AliasTypeArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/AliasTypeArrayAc.ref.hpp
index 75570a3d3..d026a1410 100644
--- a/compiler/tools/fpp-to-cpp/test/array/AliasTypeArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/AliasTypeArrayAc.ref.hpp
@@ -8,7 +8,7 @@
 #define AliasTypeArrayAc_HPP
 
 #include "ATAliasAc.hpp"
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/BuiltInTypeArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/BuiltInTypeArrayAc.ref.cpp
deleted file mode 100644
index 389d97e51..000000000
--- a/compiler/tools/fpp-to-cpp/test/array/BuiltInTypeArrayAc.ref.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-// ======================================================================
-// \title  BuiltInTypeArrayAc.cpp
-// \author Generated by fpp-to-cpp
-// \brief  cpp file for BuiltInType array
-// ======================================================================
-
-#include "BuiltInTypeArrayAc.hpp"
-#include "Fw/Types/Assert.hpp"
-
-// ----------------------------------------------------------------------
-// Constructors
-// ----------------------------------------------------------------------
-
-BuiltInType ::
-  BuiltInType() :
-    Serializable()
-{
-  // Construct using element-wise constructor
-  *this = BuiltInType(
-    0,
-    0,
-    0
-  );
-}
-
-BuiltInType ::
-  BuiltInType(const ElementType (&a)[SIZE]) :
-    Serializable()
-{
-  for (U32 index = 0; index < SIZE; index++) {
-    this->elements[index] = a[index];
-  }
-}
-
-BuiltInType ::
-  BuiltInType(const ElementType& e) :
-    Serializable()
-{
-  for (U32 index = 0; index < SIZE; index++) {
-    this->elements[index] = e;
-  }
-}
-
-BuiltInType ::
-  BuiltInType(
-      const ElementType& e1,
-      const ElementType& e2,
-      const ElementType& e3
-  ) :
-    Serializable()
-{
-  this->elements[0] = e1;
-  this->elements[1] = e2;
-  this->elements[2] = e3;
-}
-
-BuiltInType ::
-  BuiltInType(const BuiltInType& obj) :
-    Serializable()
-{
-  for (U32 index = 0; index < SIZE; index++) {
-    this->elements[index] = obj.elements[index];
-  }
-}
-
-// ----------------------------------------------------------------------
-// Operators
-// ----------------------------------------------------------------------
-
-BuiltInType::ElementType& BuiltInType ::
-  operator[](const U32 i)
-{
-  FW_ASSERT(i < SIZE, static_cast<FwAssertArgType>(i), static_cast<FwAssertArgType>(SIZE));
-  return this->elements[i];
-}
-
-const BuiltInType::ElementType& BuiltInType ::
-  operator[](const U32 i) const
-{
-  FW_ASSERT(i < SIZE, static_cast<FwAssertArgType>(i), static_cast<FwAssertArgType>(SIZE));
-  return this->elements[i];
-}
-
-BuiltInType& BuiltInType ::
-  operator=(const BuiltInType& obj)
-{
-  if (this == &obj) {
-    return *this;
-  }
-
-  for (U32 index = 0; index < SIZE; index++) {
-    this->elements[index] = obj.elements[index];
-  }
-  return *this;
-}
-
-BuiltInType& BuiltInType ::
-  operator=(const ElementType (&a)[SIZE])
-{
-  for (U32 index = 0; index < SIZE; index++) {
-    this->elements[index] = a[index];
-  }
-  return *this;
-}
-
-BuiltInType& BuiltInType ::
-  operator=(const ElementType& e)
-{
-  for (U32 index = 0; index < SIZE; index++) {
-    this->elements[index] = e;
-  }
-  return *this;
-}
-
-bool BuiltInType ::
-  operator==(const BuiltInType& obj) const
-{
-  for (U32 index = 0; index < SIZE; index++) {
-    if (!((*this)[index] == obj[index])) {
-      return false;
-    }
-  }
-  return true;
-}
-
-bool BuiltInType ::
-  operator!=(const BuiltInType& obj) const
-{
-  return !(*this == obj);
-}
-
-#ifdef BUILD_UT
-
-std::ostream& operator<<(std::ostream& os, const BuiltInType& obj) {
-  Fw::String s;
-  obj.toString(s);
-  os << s;
-  return os;
-}
-
-#endif
-
-// ----------------------------------------------------------------------
-// Public member functions
-// ----------------------------------------------------------------------
-
-Fw::SerializeStatus BuiltInType ::
-  serialize(Fw::SerializeBufferBase& buffer) const
-{
-  Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK;
-  for (U32 index = 0; index < SIZE; index++) {
-    status = buffer.serialize((*this)[index]);
-    if (status != Fw::FW_SERIALIZE_OK) {
-      return status;
-    }
-  }
-  return status;
-}
-
-Fw::SerializeStatus BuiltInType ::
-  deserialize(Fw::SerializeBufferBase& buffer)
-{
-  Fw::SerializeStatus status = Fw::FW_SERIALIZE_OK;
-  for (U32 index = 0; index < SIZE; index++) {
-    status = buffer.deserialize((*this)[index]);
-    if (status != Fw::FW_SERIALIZE_OK) {
-      return status;
-    }
-  }
-  return status;
-}
-
-#if FW_SERIALIZABLE_TO_STRING
-
-void BuiltInType ::
-  toString(Fw::StringBase& sb) const
-{
-  static const char *formatString = "[ "
-    "%s "
-    "%s "
-    "%s ]";
-
-  sb.format(
-    formatString,
-    this->elements[0],
-    this->elements[1],
-    this->elements[2]
-  );
-}
-
-#endif
diff --git a/compiler/tools/fpp-to-cpp/test/array/BuiltInTypeArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/BuiltInTypeArrayAc.ref.hpp
deleted file mode 100644
index 0e691ce1f..000000000
--- a/compiler/tools/fpp-to-cpp/test/array/BuiltInTypeArrayAc.ref.hpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// ======================================================================
-// \title  BuiltInTypeArrayAc.hpp
-// \author Generated by fpp-to-cpp
-// \brief  hpp file for BuiltInType array
-// ======================================================================
-
-#ifndef BuiltInTypeArrayAc_HPP
-#define BuiltInTypeArrayAc_HPP
-
-#include "FpConfig.hpp"
-#include "Fw/Types/ExternalString.hpp"
-#include "Fw/Types/Serializable.hpp"
-#include "Fw/Types/String.hpp"
-
-//! An array of a built-in type
-class BuiltInType :
-  public Fw::Serializable
-{
-
-  public:
-
-    // ----------------------------------------------------------------------
-    // Types
-    // ----------------------------------------------------------------------
-
-    //! The element type
-    using ElementType = FwOpcodeType;
-
-  public:
-
-    // ----------------------------------------------------------------------
-    // Constants
-    // ----------------------------------------------------------------------
-
-    enum {
-      //! The size of the array
-      SIZE = 3,
-      //! The serialized size of each element
-      ELEMENT_SERIALIZED_SIZE = sizeof(FwOpcodeType),
-      //! The size of the serial representation
-      SERIALIZED_SIZE = SIZE * ELEMENT_SERIALIZED_SIZE
-    };
-
-  public:
-
-    // ----------------------------------------------------------------------
-    // Constructors
-    // ----------------------------------------------------------------------
-
-    //! Constructor (default value)
-    BuiltInType();
-
-    //! Constructor (user-provided value)
-    BuiltInType(
-        const ElementType (&a)[SIZE] //!< The array
-    );
-
-    //! Constructor (single element)
-    BuiltInType(
-        const ElementType& e //!< The element
-    );
-
-    //! Constructor (multiple elements)
-    BuiltInType(
-        const ElementType& e1, //!< Element 1
-        const ElementType& e2, //!< Element 2
-        const ElementType& e3 //!< Element 3
-    );
-
-    //! Copy Constructor
-    BuiltInType(
-        const BuiltInType& obj //!< The source object
-    );
-
-  public:
-
-    // ----------------------------------------------------------------------
-    // Operators
-    // ----------------------------------------------------------------------
-
-    //! Subscript operator
-    ElementType& operator[](
-        const U32 i //!< The subscript index
-    );
-
-    //! Const subscript operator
-    const ElementType& operator[](
-        const U32 i //!< The subscript index
-    ) const;
-
-    //! Copy assignment operator (object)
-    BuiltInType& operator=(
-        const BuiltInType& obj //!< The source object
-    );
-
-    //! Copy assignment operator (raw array)
-    BuiltInType& operator=(
-        const ElementType (&a)[SIZE] //!< The source array
-    );
-
-    //! Copy assignment operator (single element)
-    BuiltInType& operator=(
-        const ElementType& e //!< The element
-    );
-
-    //! Equality operator
-    bool operator==(
-        const BuiltInType& obj //!< The other object
-    ) const;
-
-    //! Inequality operator
-    bool operator!=(
-        const BuiltInType& obj //!< The other object
-    ) const;
-
-#ifdef BUILD_UT
-
-    //! Ostream operator
-    friend std::ostream& operator<<(
-        std::ostream& os, //!< The ostream
-        const BuiltInType& obj //!< The object
-    );
-
-#endif
-
-  public:
-
-    // ----------------------------------------------------------------------
-    // Public member functions
-    // ----------------------------------------------------------------------
-
-    //! Serialization
-    Fw::SerializeStatus serialize(
-        Fw::SerializeBufferBase& buffer //!< The serial buffer
-    ) const;
-
-    //! Deserialization
-    Fw::SerializeStatus deserialize(
-        Fw::SerializeBufferBase& buffer //!< The serial buffer
-    );
-
-#if FW_SERIALIZABLE_TO_STRING
-
-    //! Convert array to string
-    void toString(
-        Fw::StringBase& sb //!< The StringBase object to hold the result
-    ) const;
-
-#endif
-
-  private:
-
-    // ----------------------------------------------------------------------
-    // Member variables
-    // ----------------------------------------------------------------------
-
-    //! The array elements
-    ElementType elements[SIZE];
-
-};
-
-#endif
diff --git a/compiler/tools/fpp-to-cpp/test/array/C_AArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/C_AArrayAc.ref.hpp
index ee3cec050..edd6cf9d2 100644
--- a/compiler/tools/fpp-to-cpp/test/array/C_AArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/C_AArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef C_C_AArrayAc_HPP
 #define C_C_AArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/E1EnumAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/E1EnumAc.ref.hpp
index 99431d49c..58dd9ad5d 100644
--- a/compiler/tools/fpp-to-cpp/test/array/E1EnumAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/E1EnumAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_E1EnumAc_HPP
 #define M_E1EnumAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
diff --git a/compiler/tools/fpp-to-cpp/test/array/E2EnumAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/E2EnumAc.ref.hpp
index 56f884601..1542fee4f 100644
--- a/compiler/tools/fpp-to-cpp/test/array/E2EnumAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/E2EnumAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef E2EnumAc_HPP
 #define E2EnumAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
diff --git a/compiler/tools/fpp-to-cpp/test/array/Enum1ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/Enum1ArrayAc.ref.hpp
index e768898ad..779165e22 100644
--- a/compiler/tools/fpp-to-cpp/test/array/Enum1ArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/Enum1ArrayAc.ref.hpp
@@ -8,7 +8,7 @@
 #define Enum1ArrayAc_HPP
 
 #include "E1EnumAc.hpp"
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/Enum2ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/Enum2ArrayAc.ref.hpp
index aa9663a76..799cd087b 100644
--- a/compiler/tools/fpp-to-cpp/test/array/Enum2ArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/Enum2ArrayAc.ref.hpp
@@ -8,7 +8,7 @@
 #define Enum2ArrayAc_HPP
 
 #include "E2EnumAc.hpp"
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/HeaderPathArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/HeaderPathArrayAc.ref.hpp
index c9c33bac2..9199c6144 100644
--- a/compiler/tools/fpp-to-cpp/test/array/HeaderPathArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/HeaderPathArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef HeaderPathArrayAc_HPP
 #define HeaderPathArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveArrayArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveArrayArrayAc.ref.hpp
index 4672b90bc..11415c581 100644
--- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveArrayArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveArrayArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef PrimitiveArrayArrayAc_HPP
 #define PrimitiveArrayArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveBoolArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveBoolArrayAc.ref.hpp
index ed01dace5..b0aafe8af 100644
--- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveBoolArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveBoolArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_PrimitiveBoolArrayAc_HPP
 #define M_PrimitiveBoolArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32eArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32eArrayAc.ref.hpp
index e94962af4..3f5943392 100644
--- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32eArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32eArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_PrimitiveF32eArrayAc_HPP
 #define M_PrimitiveF32eArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32fArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32fArrayAc.ref.hpp
index f27be56f5..a3f5d8416 100644
--- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32fArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32fArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_PrimitiveF32fArrayAc_HPP
 #define M_PrimitiveF32fArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF64ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF64ArrayAc.ref.hpp
index 4624a7cfb..114a34cdf 100644
--- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF64ArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF64ArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_PrimitiveF64ArrayAc_HPP
 #define M_PrimitiveF64ArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveI32ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveI32ArrayAc.ref.hpp
index 5f01491e3..db165a382 100644
--- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveI32ArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveI32ArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_PrimitiveI32ArrayAc_HPP
 #define M_PrimitiveI32ArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveI64ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveI64ArrayAc.ref.hpp
index 41211b023..2013a6e59 100644
--- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveI64ArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveI64ArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_PrimitiveI64ArrayAc_HPP
 #define M_PrimitiveI64ArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveU16ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveU16ArrayAc.ref.hpp
index f0d2be05f..061cf918f 100644
--- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveU16ArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveU16ArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_PrimitiveU16ArrayAc_HPP
 #define M_PrimitiveU16ArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveU8ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveU8ArrayAc.ref.hpp
index 6d8fd2ed9..0a851a371 100644
--- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveU8ArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveU8ArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_PrimitiveU8ArrayAc_HPP
 #define M_PrimitiveU8ArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.hpp
index 6aa6168ec..abceb9f40 100644
--- a/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_S1SerializableAc_HPP
 #define M_S1SerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/S2SerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/S2SerializableAc.ref.hpp
index 4d539fc9d..d486d62a8 100644
--- a/compiler/tools/fpp-to-cpp/test/array/S2SerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/S2SerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef S2SerializableAc_HPP
 #define S2SerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/S3SerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/S3SerializableAc.ref.hpp
index a34032f45..698ede727 100644
--- a/compiler/tools/fpp-to-cpp/test/array/S3SerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/S3SerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef S_S3SerializableAc_HPP
 #define S_S3SerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/SingleElementArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/SingleElementArrayAc.ref.hpp
index 1e20aa09a..2422b5169 100644
--- a/compiler/tools/fpp-to-cpp/test/array/SingleElementArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/SingleElementArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef SingleElementArrayAc_HPP
 #define SingleElementArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.hpp
index 38cd8fc0c..342ac0bac 100644
--- a/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef String1ArrayAc_HPP
 #define String1ArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.hpp
index 26092a90f..c50388c76 100644
--- a/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef String2ArrayAc_HPP
 #define String2ArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/StringArrayArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/StringArrayArrayAc.ref.hpp
index 9d276b464..b27cc8e5f 100644
--- a/compiler/tools/fpp-to-cpp/test/array/StringArrayArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/StringArrayArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef StringArrayArrayAc_HPP
 #define StringArrayArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/Struct1ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/Struct1ArrayAc.ref.hpp
index 67c989999..aabb0d65d 100644
--- a/compiler/tools/fpp-to-cpp/test/array/Struct1ArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/Struct1ArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef Struct1ArrayAc_HPP
 #define Struct1ArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/Struct2ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/Struct2ArrayAc.ref.hpp
index 3c6c22f4e..7dfa7ef59 100644
--- a/compiler/tools/fpp-to-cpp/test/array/Struct2ArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/Struct2ArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef Struct2ArrayAc_HPP
 #define Struct2ArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/Struct3ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/Struct3ArrayAc.ref.hpp
index 5aadb1fca..add922a38 100644
--- a/compiler/tools/fpp-to-cpp/test/array/Struct3ArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/array/Struct3ArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef Struct3ArrayAc_HPP
 #define Struct3ArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/array/builtin_type.fpp b/compiler/tools/fpp-to-cpp/test/array/builtin_type.fpp
deleted file mode 100644
index 9d623bf61..000000000
--- a/compiler/tools/fpp-to-cpp/test/array/builtin_type.fpp
+++ /dev/null
@@ -1,4 +0,0 @@
-type FwOpcodeType
-
-@ An array of a built-in type
-array BuiltInType = [3] FwOpcodeType
diff --git a/compiler/tools/fpp-to-cpp/test/array/builtin_type.ref.txt b/compiler/tools/fpp-to-cpp/test/array/builtin_type.ref.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/compiler/tools/fpp-to-cpp/test/array/check-cpp b/compiler/tools/fpp-to-cpp/test/array/check-cpp
index 957a6e566..2b7f02ab2 100755
--- a/compiler/tools/fpp-to-cpp/test/array/check-cpp
+++ b/compiler/tools/fpp-to-cpp/test/array/check-cpp
@@ -19,5 +19,5 @@ do
   cp $base.ref.hpp $base.hpp
   cp $base.ref.cpp $base.cpp
   echo "compiling $base.cpp"
-  $fprime_gcc -Iinclude -c $base.cpp
+  $fprime_gcc -Iinclude -I ../fprime -c $base.cpp
 done
diff --git a/compiler/tools/fpp-to-cpp/test/array/run.sh b/compiler/tools/fpp-to-cpp/test/array/run.sh
index 7c0b519f2..e303e805c 100644
--- a/compiler/tools/fpp-to-cpp/test/array/run.sh
+++ b/compiler/tools/fpp-to-cpp/test/array/run.sh
@@ -12,12 +12,6 @@ alias_type()
     diff -u ATAliasAc.ref.hpp ATAliasAc.hpp
 }
 
-builtin_type()
-{
-  run_test "-p $PWD" builtin_type && \
-    diff_cpp BuiltInTypeArray
-}
-
 component()
 {
   run_test "-p $PWD" component && \
diff --git a/compiler/tools/fpp-to-cpp/test/array/tests.sh b/compiler/tools/fpp-to-cpp/test/array/tests.sh
index 91224ad41..c4b60b38a 100644
--- a/compiler/tools/fpp-to-cpp/test/array/tests.sh
+++ b/compiler/tools/fpp-to-cpp/test/array/tests.sh
@@ -1,7 +1,6 @@
 tests="
 abs_type
 alias_type
-builtin_type
 component
 duplicate
 enum
diff --git a/compiler/tools/fpp-to-cpp/test/array/update-ref.sh b/compiler/tools/fpp-to-cpp/test/array/update-ref.sh
index 8259224a2..ebfad2d36 100644
--- a/compiler/tools/fpp-to-cpp/test/array/update-ref.sh
+++ b/compiler/tools/fpp-to-cpp/test/array/update-ref.sh
@@ -12,12 +12,6 @@ alias_type()
   mv ATAliasAc.h ATAliasAc.ref.h
 }
 
-builtin_type()
-{
-  update "-p $PWD" builtin_type
-  move_cpp BuiltInTypeArray
-}
-
 component()
 {
   update "-p $PWD" component
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/AArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/AArrayAc.ref.hpp
index d6019cc01..076c4e5c2 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/AArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/AArrayAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef AArrayAc_HPP
 #define AArrayAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductPortsOnlyComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductPortsOnlyComponentAc.ref.hpp
index a69556389..df93e5059 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductPortsOnlyComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductPortsOnlyComponentAc.ref.hpp
@@ -7,12 +7,11 @@
 #ifndef ActiveAsyncProductPortsOnlyComponentAc_HPP
 #define ActiveAsyncProductPortsOnlyComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Comp/ActiveComponentBase.hpp"
 #include "Fw/Dp/DpRequestPortAc.hpp"
 #include "Fw/Dp/DpResponsePortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputSerializePort.hpp"
 #include "Fw/Port/OutputSerializePort.hpp"
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp
index 60670dacc..fd433153d 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef ActiveAsyncProductsComponentAc_HPP
 #define ActiveAsyncProductsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "ActiveAsyncProducts_DataSerializableAc.hpp"
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
@@ -21,6 +19,7 @@
 #include "Fw/Dp/DpRequestPortAc.hpp"
 #include "Fw/Dp/DpResponsePortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.hpp
index b281a2c58..bf0bebdc9 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef ActiveCommandsComponentAc_HPP
 #define ActiveCommandsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
@@ -19,6 +17,7 @@
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Cmd/CmdString.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.hpp
index e2212ca64..6ffd7182c 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.hpp
@@ -8,7 +8,6 @@
 #define ActiveEventsComponentAc_HPP
 
 #include <atomic>
-#include <FpConfig.hpp>
 
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
@@ -19,6 +18,7 @@
 #include "Fw/Cmd/CmdRegPortAc.hpp"
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #include "Fw/Log/LogString.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalStateMachinesComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalStateMachinesComponentAc.ref.hpp
index c2c365f75..742cf63f3 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalStateMachinesComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveExternalStateMachinesComponentAc.ref.hpp
@@ -7,11 +7,10 @@
 #ifndef ExternalSm_ActiveExternalStateMachinesComponentAc_HPP
 #define ExternalSm_ActiveExternalStateMachinesComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "ActiveExternalStateMachines_S1.hpp"
 #include "ActiveExternalStateMachines_S2.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputSerializePort.hpp"
 #include "Fw/Port/OutputSerializePort.hpp"
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp
index 6b90ea25c..5db0431eb 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef ActiveGetProductsComponentAc_HPP
 #define ActiveGetProductsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "ActiveGetProducts_DataSerializableAc.hpp"
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
@@ -20,6 +18,7 @@
 #include "Fw/Dp/DpContainer.hpp"
 #include "Fw/Dp/DpGetPortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp
index b2a1da7b0..b3bbeefd2 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef ActiveGuardedProductsComponentAc_HPP
 #define ActiveGuardedProductsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "ActiveGuardedProducts_DataSerializableAc.hpp"
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
@@ -21,6 +19,7 @@
 #include "Fw/Dp/DpRequestPortAc.hpp"
 #include "Fw/Dp/DpResponsePortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveNoArgsPortsOnlyComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveNoArgsPortsOnlyComponentAc.ref.hpp
index 6ce698476..f055e0769 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveNoArgsPortsOnlyComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveNoArgsPortsOnlyComponentAc.ref.hpp
@@ -7,9 +7,8 @@
 #ifndef ActiveNoArgsPortsOnlyComponentAc_HPP
 #define ActiveNoArgsPortsOnlyComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputSerializePort.hpp"
 #include "Fw/Port/OutputSerializePort.hpp"
 #include "NoArgsPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveOverflowComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveOverflowComponentAc.ref.hpp
index 26c79149e..3f85e3f40 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveOverflowComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveOverflowComponentAc.ref.hpp
@@ -7,14 +7,13 @@
 #ifndef ActiveOverflowComponentAc_HPP
 #define ActiveOverflowComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Cmd/CmdPortAc.hpp"
 #include "Fw/Cmd/CmdRegPortAc.hpp"
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Cmd/CmdString.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
 #include "Fw/Dp/DpResponsePortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp
index c3e68fb0a..028e05229 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef ActiveParamsComponentAc_HPP
 #define ActiveParamsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
@@ -19,6 +17,7 @@
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Cmd/CmdString.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp
index 1bdc3bd2e..fb57f93ef 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.hpp
@@ -8,7 +8,6 @@
 #define ActiveSerialComponentAc_HPP
 
 #include <atomic>
-#include <FpConfig.hpp>
 
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
@@ -20,6 +19,7 @@
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Cmd/CmdString.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #include "Fw/Log/LogString.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp
index 323140ac2..10386a1de 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef ActiveSyncProductsComponentAc_HPP
 #define ActiveSyncProductsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "ActiveSyncProducts_DataSerializableAc.hpp"
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
@@ -21,6 +19,7 @@
 #include "Fw/Dp/DpRequestPortAc.hpp"
 #include "Fw/Dp/DpResponsePortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.hpp
index a52c17e0c..3641c3f12 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef ActiveTelemetryComponentAc_HPP
 #define ActiveTelemetryComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
@@ -18,6 +16,7 @@
 #include "Fw/Cmd/CmdRegPortAc.hpp"
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp
index e13ec886e..b8521d1a8 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.hpp
@@ -8,7 +8,6 @@
 #define M_ActiveTestComponentAc_HPP
 
 #include <atomic>
-#include <FpConfig.hpp>
 
 #include "AArrayAc.hpp"
 #include "ActiveTest_DataSerializableAc.hpp"
@@ -25,6 +24,7 @@
 #include "Fw/Dp/DpRequestPortAc.hpp"
 #include "Fw/Dp/DpResponsePortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #include "Fw/Log/LogString.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/AliasAliasArrayAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/AliasAliasArrayAliasAc.ref.hpp
index 699ad9ec8..e6b5b1f35 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/AliasAliasArrayAliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/AliasAliasArrayAliasAc.ref.hpp
@@ -7,10 +7,8 @@
 #ifndef AliasAliasArrayAliasAc_HPP
 #define AliasAliasArrayAliasAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AliasArrayAliasAc.hpp"
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 
 using AliasAliasArray = AliasArray;
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/AliasArrayAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/AliasArrayAliasAc.ref.hpp
index f6201018a..1e402fa7a 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/AliasArrayAliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/AliasArrayAliasAc.ref.hpp
@@ -7,10 +7,8 @@
 #ifndef AliasArrayAliasAc_HPP
 #define AliasArrayAliasAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AArrayAc.hpp"
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 
 //! Alias of an array
 using AliasArray = A;
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/AliasArrayAliasArrayAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/AliasArrayAliasArrayAliasAc.ref.hpp
index e108a031e..e85303007 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/AliasArrayAliasArrayAliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/AliasArrayAliasArrayAliasAc.ref.hpp
@@ -7,10 +7,8 @@
 #ifndef AliasArrayAliasArrayAliasAc_HPP
 #define AliasArrayAliasArrayAliasAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "ArrayAliasArrayArrayAc.hpp"
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 
 using AliasArrayAliasArray = ArrayAliasArray;
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/AliasBoolAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/AliasBoolAliasAc.ref.hpp
index b9e967a60..addf2fde0 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/AliasBoolAliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/AliasBoolAliasAc.ref.hpp
@@ -7,9 +7,7 @@
 #ifndef AliasBoolAliasAc_HPP
 #define AliasBoolAliasAc_HPP
 
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 
 //! Alias of a boolean
 using AliasBool = bool;
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/AliasEnumAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/AliasEnumAliasAc.ref.hpp
index a24a7103c..e09d86e5e 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/AliasEnumAliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/AliasEnumAliasAc.ref.hpp
@@ -7,10 +7,8 @@
 #ifndef AliasEnumAliasAc_HPP
 #define AliasEnumAliasAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "EEnumAc.hpp"
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 
 //! Alias of an enum
 using AliasEnum = E;
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/AliasPrim1AliasAc.ref.h b/compiler/tools/fpp-to-cpp/test/component/base/AliasPrim1AliasAc.ref.h
index 4986f48eb..8f9c1a23d 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/AliasPrim1AliasAc.ref.h
+++ b/compiler/tools/fpp-to-cpp/test/component/base/AliasPrim1AliasAc.ref.h
@@ -7,12 +7,10 @@
 #ifndef AliasPrim1AliasAc_H
 #define AliasPrim1AliasAc_H
 
-#include <FpConfig.h>
-
 #include "Fw/Types/BasicTypes.h"
 
 //! Alias of a primitive type
 typedef U32 AliasPrim1;
-#define PRI_AliasPrim1 PRI_u32
+#define PRI_AliasPrim1 PRI_U32
 
 #endif
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/AliasPrim1AliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/AliasPrim1AliasAc.ref.hpp
index b95550f84..19118f64d 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/AliasPrim1AliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/AliasPrim1AliasAc.ref.hpp
@@ -7,9 +7,7 @@
 #ifndef AliasPrim1AliasAc_HPP
 #define AliasPrim1AliasAc_HPP
 
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 
 extern "C" {
 #include "AliasPrim1AliasAc.h"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/AliasPrim2AliasAc.ref.h b/compiler/tools/fpp-to-cpp/test/component/base/AliasPrim2AliasAc.ref.h
index faf46e197..739f6ef04 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/AliasPrim2AliasAc.ref.h
+++ b/compiler/tools/fpp-to-cpp/test/component/base/AliasPrim2AliasAc.ref.h
@@ -7,12 +7,9 @@
 #ifndef AliasPrim2AliasAc_H
 #define AliasPrim2AliasAc_H
 
-#include <FpConfig.h>
-
 #include "Fw/Types/BasicTypes.h"
 
 //! Alias of another primtive type
 typedef F32 AliasPrim2;
-#define PRI_AliasPrim2 PRI_f32
 
 #endif
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/AliasPrim2AliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/AliasPrim2AliasAc.ref.hpp
index 854212311..c7b2b024a 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/AliasPrim2AliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/AliasPrim2AliasAc.ref.hpp
@@ -7,9 +7,7 @@
 #ifndef AliasPrim2AliasAc_HPP
 #define AliasPrim2AliasAc_HPP
 
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 
 extern "C" {
 #include "AliasPrim2AliasAc.h"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/AliasStringAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/AliasStringAliasAc.ref.hpp
index edfa4e490..2bf8bfe65 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/AliasStringAliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/AliasStringAliasAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef AliasStringAliasAc_HPP
 #define AliasStringAliasAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Types/String.hpp"
 
 //! Alias of a string
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/AliasStructAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/AliasStructAliasAc.ref.hpp
index 0db1c795e..0491b9b05 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/AliasStructAliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/AliasStructAliasAc.ref.hpp
@@ -7,9 +7,7 @@
 #ifndef AliasStructAliasAc_HPP
 #define AliasStructAliasAc_HPP
 
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 #include "SSerializableAc.hpp"
 
 //! Alias of a struct
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/AnotherAliasStructAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/AnotherAliasStructAliasAc.ref.hpp
index b3ca404fa..0c1b7e4fe 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/AnotherAliasStructAliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/AnotherAliasStructAliasAc.ref.hpp
@@ -7,9 +7,7 @@
 #ifndef AnotherAliasStructAliasAc_HPP
 #define AnotherAliasStructAliasAc_HPP
 
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 #include "StructWithAliasSerializableAc.hpp"
 
 using AnotherAliasStruct = StructWithAlias;
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ArrayAliasArrayArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ArrayAliasArrayArrayAc.ref.hpp
index d0c13f7cb..b4f3cb8c5 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/ArrayAliasArrayArrayAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/ArrayAliasArrayArrayAc.ref.hpp
@@ -8,7 +8,7 @@
 #define ArrayAliasArrayArrayAc_HPP
 
 #include "AliasAliasArrayAliasAc.hpp"
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/EEnumAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/EEnumAc.ref.hpp
index 72f23b454..72fd2a812 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/EEnumAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/EEnumAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef EEnumAc_HPP
 #define EEnumAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/EmptyComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/EmptyComponentAc.ref.hpp
index 80de619e0..1c446ee3b 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/EmptyComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/EmptyComponentAc.ref.hpp
@@ -7,9 +7,8 @@
 #ifndef EmptyComponentAc_HPP
 #define EmptyComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputSerializePort.hpp"
 #include "Fw/Port/OutputSerializePort.hpp"
 
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 1e3763316..794d3e7a6 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
@@ -9,9 +9,9 @@
 
 #include <cstdio>
 #include <cstring>
-#include <FpConfig.hpp>
 
 #include "Fw/Comp/PassiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/Serializable.hpp"
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 453bffeae..be2f2541c 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
@@ -9,9 +9,9 @@
 
 #include <cstdio>
 #include <cstring>
-#include <FpConfig.hpp>
 
 #include "Fw/Comp/PassiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveCommandsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveCommandsComponentAc.ref.hpp
index 57895165f..02b8f9255 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveCommandsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveCommandsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef PassiveCommandsComponentAc_HPP
 #define PassiveCommandsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
@@ -19,6 +17,7 @@
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Cmd/CmdString.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.hpp
index cedc4b873..7609a6247 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.hpp
@@ -8,7 +8,6 @@
 #define PassiveEventsComponentAc_HPP
 
 #include <atomic>
-#include <FpConfig.hpp>
 
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
@@ -19,6 +18,7 @@
 #include "Fw/Cmd/CmdRegPortAc.hpp"
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #include "Fw/Log/LogString.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductPortsOnlyComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductPortsOnlyComponentAc.ref.hpp
index f4a11e42c..b8a47311c 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductPortsOnlyComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductPortsOnlyComponentAc.ref.hpp
@@ -7,11 +7,10 @@
 #ifndef PassiveGetProductPortsOnlyComponentAc_HPP
 #define PassiveGetProductPortsOnlyComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Comp/ActiveComponentBase.hpp"
 #include "Fw/Dp/DpGetPortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputSerializePort.hpp"
 #include "Fw/Port/OutputSerializePort.hpp"
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp
index 25364bc80..9b8e88650 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef PassiveGetProductsComponentAc_HPP
 #define PassiveGetProductsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
 #include "AliasTypedReturnStringPortAc.hpp"
@@ -19,6 +17,7 @@
 #include "Fw/Dp/DpContainer.hpp"
 #include "Fw/Dp/DpGetPortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp
index 677fb3e16..83a5d8c5f 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef PassiveGuardedProductsComponentAc_HPP
 #define PassiveGuardedProductsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
 #include "AliasTypedReturnStringPortAc.hpp"
@@ -20,6 +18,7 @@
 #include "Fw/Dp/DpRequestPortAc.hpp"
 #include "Fw/Dp/DpResponsePortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp
index cf116c6da..17af2eafb 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef PassiveParamsComponentAc_HPP
 #define PassiveParamsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
@@ -19,6 +17,7 @@
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Cmd/CmdString.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp
index 660ebd5d5..05947776d 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.hpp
@@ -8,7 +8,6 @@
 #define PassiveSerialComponentAc_HPP
 
 #include <atomic>
-#include <FpConfig.hpp>
 
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
@@ -20,6 +19,7 @@
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Cmd/CmdString.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #include "Fw/Log/LogString.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.hpp
index ad2c84d46..ab03fa5e2 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductPortsOnlyComponentAc.ref.hpp
@@ -7,12 +7,11 @@
 #ifndef PassiveSyncProductPortsOnlyComponentAc_HPP
 #define PassiveSyncProductPortsOnlyComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Comp/ActiveComponentBase.hpp"
 #include "Fw/Dp/DpRequestPortAc.hpp"
 #include "Fw/Dp/DpResponsePortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputSerializePort.hpp"
 #include "Fw/Port/OutputSerializePort.hpp"
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp
index 6150530da..aff01ca0f 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef PassiveSyncProductsComponentAc_HPP
 #define PassiveSyncProductsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
 #include "AliasTypedReturnStringPortAc.hpp"
@@ -20,6 +18,7 @@
 #include "Fw/Dp/DpRequestPortAc.hpp"
 #include "Fw/Dp/DpResponsePortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.hpp
index 27079ff09..2694499b4 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef PassiveTelemetryComponentAc_HPP
 #define PassiveTelemetryComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
@@ -18,6 +16,7 @@
 #include "Fw/Cmd/CmdRegPortAc.hpp"
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp
index 8beec081b..a203d01e8 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.hpp
@@ -8,7 +8,6 @@
 #define PassiveTestComponentAc_HPP
 
 #include <atomic>
-#include <FpConfig.hpp>
 
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
@@ -24,6 +23,7 @@
 #include "Fw/Dp/DpRequestPortAc.hpp"
 #include "Fw/Dp/DpResponsePortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #include "Fw/Log/LogString.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductPortsOnlyComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductPortsOnlyComponentAc.ref.hpp
index c2c674661..a58d41236 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductPortsOnlyComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductPortsOnlyComponentAc.ref.hpp
@@ -7,12 +7,11 @@
 #ifndef QueuedAsyncProductPortsOnlyComponentAc_HPP
 #define QueuedAsyncProductPortsOnlyComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Comp/ActiveComponentBase.hpp"
 #include "Fw/Dp/DpRequestPortAc.hpp"
 #include "Fw/Dp/DpResponsePortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputSerializePort.hpp"
 #include "Fw/Port/OutputSerializePort.hpp"
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp
index 1199c2bd6..4f3dd20ac 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef QueuedAsyncProductsComponentAc_HPP
 #define QueuedAsyncProductsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
 #include "AliasTypedReturnStringPortAc.hpp"
@@ -20,6 +18,7 @@
 #include "Fw/Dp/DpRequestPortAc.hpp"
 #include "Fw/Dp/DpResponsePortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.hpp
index d8319f2c3..84fe97ec6 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef QueuedCommandsComponentAc_HPP
 #define QueuedCommandsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
@@ -19,6 +17,7 @@
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Cmd/CmdString.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.hpp
index cdfc3ecc6..d5d97d9cd 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.hpp
@@ -8,7 +8,6 @@
 #define QueuedEventsComponentAc_HPP
 
 #include <atomic>
-#include <FpConfig.hpp>
 
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
@@ -19,6 +18,7 @@
 #include "Fw/Cmd/CmdRegPortAc.hpp"
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #include "Fw/Log/LogString.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp
index 535b440dd..1d5b5a914 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef QueuedGetProductsComponentAc_HPP
 #define QueuedGetProductsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
 #include "AliasTypedReturnStringPortAc.hpp"
@@ -19,6 +17,7 @@
 #include "Fw/Dp/DpContainer.hpp"
 #include "Fw/Dp/DpGetPortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp
index 4232440f5..ca9f20bb1 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef QueuedGuardedProductsComponentAc_HPP
 #define QueuedGuardedProductsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
 #include "AliasTypedReturnStringPortAc.hpp"
@@ -20,6 +18,7 @@
 #include "Fw/Dp/DpRequestPortAc.hpp"
 #include "Fw/Dp/DpResponsePortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedNoArgsPortsOnlyComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedNoArgsPortsOnlyComponentAc.ref.hpp
index 1d7ea02aa..fda80053c 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedNoArgsPortsOnlyComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedNoArgsPortsOnlyComponentAc.ref.hpp
@@ -7,9 +7,8 @@
 #ifndef QueuedNoArgsPortsOnlyComponentAc_HPP
 #define QueuedNoArgsPortsOnlyComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputSerializePort.hpp"
 #include "Fw/Port/OutputSerializePort.hpp"
 #include "NoArgsPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedOverflowComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedOverflowComponentAc.ref.hpp
index c3873a4e2..af21481fb 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedOverflowComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedOverflowComponentAc.ref.hpp
@@ -7,14 +7,13 @@
 #ifndef QueuedOverflowComponentAc_HPP
 #define QueuedOverflowComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Cmd/CmdPortAc.hpp"
 #include "Fw/Cmd/CmdRegPortAc.hpp"
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Cmd/CmdString.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
 #include "Fw/Dp/DpResponsePortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp
index 6f2244e5f..4686baf1e 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef QueuedParamsComponentAc_HPP
 #define QueuedParamsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
@@ -19,6 +17,7 @@
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Cmd/CmdString.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp
index ba49e75b2..01b503d3f 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.hpp
@@ -8,7 +8,6 @@
 #define QueuedSerialComponentAc_HPP
 
 #include <atomic>
-#include <FpConfig.hpp>
 
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
@@ -20,6 +19,7 @@
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Cmd/CmdString.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #include "Fw/Log/LogString.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp
index 683103435..8faa86378 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef QueuedSyncProductsComponentAc_HPP
 #define QueuedSyncProductsComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
 #include "AliasTypedReturnStringPortAc.hpp"
@@ -20,6 +18,7 @@
 #include "Fw/Dp/DpRequestPortAc.hpp"
 #include "Fw/Dp/DpResponsePortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.hpp
index aac01bdf9..6b67ee2f5 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.hpp
@@ -7,8 +7,6 @@
 #ifndef QueuedTelemetryComponentAc_HPP
 #define QueuedTelemetryComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
 #include "AliasTypedReturnPortAc.hpp"
@@ -18,6 +16,7 @@
 #include "Fw/Cmd/CmdRegPortAc.hpp"
 #include "Fw/Cmd/CmdResponsePortAc.hpp"
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
 #include "Fw/Log/LogTextPortAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp
index 4b8897bdc..fbad9cb06 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.hpp
@@ -8,7 +8,6 @@
 #define QueuedTestComponentAc_HPP
 
 #include <atomic>
-#include <FpConfig.hpp>
 
 #include "AArrayAc.hpp"
 #include "AliasTypedPortAc.hpp"
@@ -24,6 +23,7 @@
 #include "Fw/Dp/DpRequestPortAc.hpp"
 #include "Fw/Dp/DpResponsePortAc.hpp"
 #include "Fw/Dp/DpSendPortAc.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Log/LogPortAc.hpp"
 #include "Fw/Log/LogString.hpp"
 #if FW_ENABLE_TEXT_LOGGING == 1
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.hpp
index b69b1db78..bcd398414 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef SSerializableAc_HPP
 #define SSerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/SmChoiceActiveComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/SmChoiceActiveComponentAc.ref.hpp
index 8de9c1ffc..bcfa3ba08 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/SmChoiceActiveComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/SmChoiceActiveComponentAc.ref.hpp
@@ -7,9 +7,8 @@
 #ifndef FppTest_SmChoiceActiveComponentAc_HPP
 #define FppTest_SmChoiceActiveComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputSerializePort.hpp"
 #include "Fw/Port/OutputSerializePort.hpp"
 #include "SmChoiceActive_BasicStateMachineAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/SmChoiceQueuedComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/SmChoiceQueuedComponentAc.ref.hpp
index 01793209a..fb86aac5c 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/SmChoiceQueuedComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/SmChoiceQueuedComponentAc.ref.hpp
@@ -7,9 +7,8 @@
 #ifndef FppTest_SmChoiceQueuedComponentAc_HPP
 #define FppTest_SmChoiceQueuedComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputSerializePort.hpp"
 #include "Fw/Port/OutputSerializePort.hpp"
 #include "SmChoiceQueued_BasicStateMachineAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/SmInitialActiveComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/SmInitialActiveComponentAc.ref.hpp
index 30881c56a..846b55ac2 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/SmInitialActiveComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/SmInitialActiveComponentAc.ref.hpp
@@ -7,9 +7,8 @@
 #ifndef FppTest_SmInitialActiveComponentAc_HPP
 #define FppTest_SmInitialActiveComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputSerializePort.hpp"
 #include "Fw/Port/OutputSerializePort.hpp"
 #include "SmInitialActive_BasicStateMachineAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/SmInitialQueuedComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/SmInitialQueuedComponentAc.ref.hpp
index 2679c91d3..74132df47 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/SmInitialQueuedComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/SmInitialQueuedComponentAc.ref.hpp
@@ -7,9 +7,8 @@
 #ifndef FppTest_SmInitialQueuedComponentAc_HPP
 #define FppTest_SmInitialQueuedComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputSerializePort.hpp"
 #include "Fw/Port/OutputSerializePort.hpp"
 #include "SmInitialQueued_BasicStateMachineAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/SmStateActiveComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/SmStateActiveComponentAc.ref.hpp
index ee604b3cf..7ef33061a 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/SmStateActiveComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/SmStateActiveComponentAc.ref.hpp
@@ -7,9 +7,8 @@
 #ifndef FppTest_SmStateActiveComponentAc_HPP
 #define FppTest_SmStateActiveComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputSerializePort.hpp"
 #include "Fw/Port/OutputSerializePort.hpp"
 #include "SmStateActive_BasicStateMachineAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/SmStateQueuedComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/SmStateQueuedComponentAc.ref.hpp
index 22b4d0f20..bfc690b0e 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/SmStateQueuedComponentAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/SmStateQueuedComponentAc.ref.hpp
@@ -7,9 +7,8 @@
 #ifndef FppTest_SmStateQueuedComponentAc_HPP
 #define FppTest_SmStateQueuedComponentAc_HPP
 
-#include <FpConfig.hpp>
-
 #include "Fw/Comp/ActiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputSerializePort.hpp"
 #include "Fw/Port/OutputSerializePort.hpp"
 #include "SmStateQueued_BasicStateMachineAc.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/base/StructWithAliasSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/StructWithAliasSerializableAc.ref.hpp
index 2687fc801..5e0acd254 100644
--- a/compiler/tools/fpp-to-cpp/test/component/base/StructWithAliasSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/component/base/StructWithAliasSerializableAc.ref.hpp
@@ -12,7 +12,7 @@
 #include "AliasArrayAliasArrayAliasAc.hpp"
 #include "AliasPrim1AliasAc.hpp"
 #include "AliasStringAliasAc.hpp"
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
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 8a9b4073a..307610248 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
@@ -9,11 +9,11 @@
 
 #include <cstdio>
 #include <cstring>
-#include <FpConfig.hpp>
 
 #include "AArrayAc.hpp"
 #include "EEnumAc.hpp"
 #include "Fw/Comp/PassiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/Serializable.hpp"
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 8368e57cd..1d429fbe7 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
@@ -9,11 +9,11 @@
 
 #include <cstdio>
 #include <cstring>
-#include <FpConfig.hpp>
 
 #include "AArrayAc.hpp"
 #include "EEnumAc.hpp"
 #include "Fw/Comp/PassiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/component/deps-comma.txt b/compiler/tools/fpp-to-cpp/test/component/deps-comma.txt
index 2298f5933..e358d6dc4 100644
--- a/compiler/tools/fpp-to-cpp/test/component/deps-comma.txt
+++ b/compiler/tools/fpp-to-cpp/test/component/deps-comma.txt
@@ -1 +1 @@
-../../fprime/Fw/Buffer/Buffer.fpp,../../fprime/Fw/Cmd/Cmd.fpp,../../fprime/Fw/Dp/Dp.fpp,../../fprime/Fw/Log/Log.fpp,../../fprime/Fw/Prm/Prm.fpp,../../fprime/Fw/Time/Time.fpp,../../fprime/Fw/Tlm/Tlm.fpp,../../fprime/Fw/Types/Types.fpp,../../fprime/Svc/Sched/Sched.fpp,../../fprime/config/DpCfg.fpp,../../fprime/config/FpConfig.fpp,../types.fpp
+../../fprime/Fw/Buffer/Buffer.fpp,../../fprime/Fw/Cmd/Cmd.fpp,../../fprime/Fw/Dp/Dp.fpp,../../fprime/Fw/Log/Log.fpp,../../fprime/Fw/Prm/Prm.fpp,../../fprime/Fw/Time/Time.fpp,../../fprime/Fw/Tlm/Tlm.fpp,../../fprime/Fw/Types/Types.fpp,../../fprime/Svc/Sched/Sched.fpp,../../fprime/config/DpCfg.fpp,../../fprime/config/FpConfig.fpp,../../fprime/Platform/PlatformTypes.fpp,../types.fpp
diff --git a/compiler/tools/fpp-to-cpp/test/component/deps.txt b/compiler/tools/fpp-to-cpp/test/component/deps.txt
index f91321da4..1e82aae0f 100644
--- a/compiler/tools/fpp-to-cpp/test/component/deps.txt
+++ b/compiler/tools/fpp-to-cpp/test/component/deps.txt
@@ -9,4 +9,5 @@
 ../../fprime/Svc/Sched/Sched.fpp
 ../../fprime/config/DpCfg.fpp
 ../../fprime/config/FpConfig.fpp
+../../fprime/Platform/PlatformTypes.fpp
 ../types.fpp
diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/check-cpp b/compiler/tools/fpp-to-cpp/test/component/impl/check-cpp
index 050966ff9..c9a1a97a0 100755
--- a/compiler/tools/fpp-to-cpp/test/component/impl/check-cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/impl/check-cpp
@@ -26,5 +26,5 @@ do
   cp $base.template.ref.hpp $base.hpp
   cp $base.template.ref.cpp $base.cpp
   echo "compiling $base.cpp"
-  $fprime_gcc -I../../../.. -I.. -I../.. -I../../fprime/config $warning_flags -c $base.cpp
+  $fprime_gcc -I../../../.. -I.. -I../.. -I../../fprime $warning_flags -c $base.cpp
 done
diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/check-cpp b/compiler/tools/fpp-to-cpp/test/component/test-impl/check-cpp
index 1ce64efb7..4827805f0 100755
--- a/compiler/tools/fpp-to-cpp/test/component/test-impl/check-cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/test-impl/check-cpp
@@ -15,7 +15,7 @@ include_flags="
 -I../base
 -I../impl
 -I../test-base
--I../../fprime/config
+-I../../fprime
 "
 define_flags="-DPROTECTED="protected" -DBUILD_UT=1"
 
diff --git a/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants.ref.hpp b/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants.ref.hpp
index 79f1d036d..16782f694 100644
--- a/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef FppConstantsAc_HPP
 #define FppConstantsAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 
 //! Constant a
 enum FppConstant_a {
diff --git a/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_guard_dir.ref.hpp b/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_guard_dir.ref.hpp
index 8edc765d9..e76e5fbaf 100644
--- a/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_guard_dir.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_guard_dir.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef fpp_to_cpp_test_constants_FppConstantsAc_HPP
 #define fpp_to_cpp_test_constants_FppConstantsAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 
 //! Constant a
 enum FppConstant_a {
diff --git a/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_guard_prefix.ref.hpp b/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_guard_prefix.ref.hpp
index 008354830..55253d1fb 100644
--- a/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_guard_prefix.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_guard_prefix.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef GUARD_PREFIX_FppConstantsAc_HPP
 #define GUARD_PREFIX_FppConstantsAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 
 //! Constant a
 enum FppConstant_a {
diff --git a/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_string.ref.hpp b/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_string.ref.hpp
index 31b0db1ba..e06e34d51 100644
--- a/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_string.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/constants/FppConstantsAc_constants_string.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef FppConstantsAc_HPP
 #define FppConstantsAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 
 //! Escaped quotation marks
 extern const char *const s1;
diff --git a/compiler/tools/fpp-to-cpp/test/constants/check-cpp b/compiler/tools/fpp-to-cpp/test/constants/check-cpp
index f78f1a68c..34436010f 100755
--- a/compiler/tools/fpp-to-cpp/test/constants/check-cpp
+++ b/compiler/tools/fpp-to-cpp/test/constants/check-cpp
@@ -18,5 +18,5 @@ do
     cp $base.$suffix $dest_base.$suffix
   done
   echo "compiling $dest_base.cpp"
-  $fprime_gcc -I../../.. -c $dest_base.cpp
+  $fprime_gcc -I../../.. -I ../fprime -c $dest_base.cpp
 done
diff --git a/compiler/tools/fpp-to-cpp/test/constants/output_dir/FppConstantsAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/constants/output_dir/FppConstantsAc.ref.hpp
index 79f1d036d..16782f694 100644
--- a/compiler/tools/fpp-to-cpp/test/constants/output_dir/FppConstantsAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/constants/output_dir/FppConstantsAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef FppConstantsAc_HPP
 #define FppConstantsAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 
 //! Constant a
 enum FppConstant_a {
diff --git a/compiler/tools/fpp-to-cpp/test/enum/C_EEnumAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/enum/C_EEnumAc.ref.hpp
index 5485c1514..21494e72d 100644
--- a/compiler/tools/fpp-to-cpp/test/enum/C_EEnumAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/enum/C_EEnumAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef C_C_EEnumAc_HPP
 #define C_C_EEnumAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
diff --git a/compiler/tools/fpp-to-cpp/test/enum/DefaultEnumAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/enum/DefaultEnumAc.ref.hpp
index 001d67b32..47f7d1b5b 100644
--- a/compiler/tools/fpp-to-cpp/test/enum/DefaultEnumAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/enum/DefaultEnumAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_DefaultEnumAc_HPP
 #define M_DefaultEnumAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
diff --git a/compiler/tools/fpp-to-cpp/test/enum/EEnumAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/enum/EEnumAc.ref.hpp
index 5ec6f6074..25a5a7e97 100644
--- a/compiler/tools/fpp-to-cpp/test/enum/EEnumAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/enum/EEnumAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef EEnumAc_HPP
 #define EEnumAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
diff --git a/compiler/tools/fpp-to-cpp/test/enum/ExplicitEnumAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/enum/ExplicitEnumAc.ref.hpp
index d914df9b6..c8acb6c91 100644
--- a/compiler/tools/fpp-to-cpp/test/enum/ExplicitEnumAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/enum/ExplicitEnumAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_ExplicitEnumAc_HPP
 #define M_ExplicitEnumAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
diff --git a/compiler/tools/fpp-to-cpp/test/enum/ImplicitEnumAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/enum/ImplicitEnumAc.ref.hpp
index 8127ac00f..5a0d9b6b6 100644
--- a/compiler/tools/fpp-to-cpp/test/enum/ImplicitEnumAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/enum/ImplicitEnumAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_ImplicitEnumAc_HPP
 #define M_ImplicitEnumAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
diff --git a/compiler/tools/fpp-to-cpp/test/enum/SerializeTypeEnumAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/enum/SerializeTypeEnumAc.ref.hpp
index 30e9798a1..8ea7f39c6 100644
--- a/compiler/tools/fpp-to-cpp/test/enum/SerializeTypeEnumAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/enum/SerializeTypeEnumAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_SerializeTypeEnumAc_HPP
 #define M_SerializeTypeEnumAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
diff --git a/compiler/tools/fpp-to-cpp/test/enum/check-cpp b/compiler/tools/fpp-to-cpp/test/enum/check-cpp
index 55f4232f2..77b83466e 100755
--- a/compiler/tools/fpp-to-cpp/test/enum/check-cpp
+++ b/compiler/tools/fpp-to-cpp/test/enum/check-cpp
@@ -14,5 +14,5 @@ do
   cp $base.ref.hpp $base.hpp
   cp $base.ref.cpp $base.cpp
   echo "compiling $base.cpp"
-  $fprime_gcc -I../fprime/config -c $base.cpp
+  $fprime_gcc -I../fprime -c $base.cpp
 done
diff --git a/compiler/tools/fpp-to-cpp/test/fprime/Platform/PlatformTypes.fpp b/compiler/tools/fpp-to-cpp/test/fprime/Platform/PlatformTypes.fpp
new file mode 100644
index 000000000..a3c63d812
--- /dev/null
+++ b/compiler/tools/fpp-to-cpp/test/fprime/Platform/PlatformTypes.fpp
@@ -0,0 +1,31 @@
+#####
+# PlatformTypes.fpp:
+#
+# Define platform type alias within this file. To maintain C-compatibility
+# leave definitions in global scope.
+####
+
+@ The unsigned type of larger sizes internal to the software,
+@ e.g., memory buffer sizes, file sizes. Must be unsigned.
+@ Supplied by platform, overridable by project.
+type PlatformSizeType = U64
+
+@ The signed type of larger sizes internal to the software, used
+@ for signed offsets, e.g., file seek offsets. Must be signed.
+type PlatformSignedSizeType = I64
+
+@ The type of smaller indicies internal to the software, used
+@ for array indicies, e.g., port indicies. Must be signed.
+type PlatformIndexType = I16
+
+@ The type of arguments to assert functions. Supplied by platform,
+@ overridable by project.
+type PlatformAssertArgType = I32
+
+@ The type of task priorities used. Supplied by platform,
+@ overridable by project.
+type PlatformTaskPriorityType = U8
+
+@ The type of queue priorities used. Supplied by platform,
+@ overridable by project.
+type PlatformQueuePriorityType = U8
diff --git a/compiler/tools/fpp-to-cpp/test/fprime/Platform/PlatformTypes.h b/compiler/tools/fpp-to-cpp/test/fprime/Platform/PlatformTypes.h
new file mode 100644
index 000000000..23040e978
--- /dev/null
+++ b/compiler/tools/fpp-to-cpp/test/fprime/Platform/PlatformTypes.h
@@ -0,0 +1,54 @@
+
+/**
+ * \brief PlatformTypes.h C-compatible type definitions for Linux/Darwin
+ *
+ * PlatformTypes.h is typically published by platform developers to define
+ * the standard available arithmetic types for use in fprime. This standard
+ * types header is designed to support standard Linux/Darwin (unix) distributions
+ * running on x86, x86_64, arm, and arm64 machines and using the standard gcc/clang
+ * compilers shipped with the operating system.
+ */
+#ifndef PLATFORM_TYPES_H_
+#define PLATFORM_TYPES_H_
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+#include <stdint.h>
+
+typedef int PlatformIntType;
+#define PRI_PlatformIntType "d"
+
+typedef unsigned int PlatformUIntType;
+#define PRI_PlatformUIntType "u"
+
+// Linux/Darwin definitions for pointer have various sizes across platforms
+// and since these definitions need to be consistent we must ask the size.
+// Check for __SIZEOF_POINTER__ or cause error
+#ifndef __SIZEOF_POINTER__
+#error "Compiler does not support __SIZEOF_POINTER__, cannot use Linux/Darwin types"
+#endif
+
+// Pointer sizes are determined by compiler
+#if __SIZEOF_POINTER__ == 8
+typedef uint64_t PlatformPointerCastType;
+#define PRI_PlatformPointerCastType PRIx64
+#elif __SIZEOF_POINTER__ == 4
+typedef uint32_t PlatformPointerCastType;
+#define PRI_PlatformPointerCastType PRIx32
+#elif __SIZEOF_POINTER__ == 2
+typedef uint16_t PlatformPointerCastType;
+#define PRI_PlatformPointerCastType PRIx16
+#elif __SIZEOF_POINTER__ == 1
+typedef uint8_t PlatformPointerCastType;
+#define PRI_PlatformPointerCastType PRIx8
+#else
+#error "Expected __SIZEOF_POINTER__ to be one of 8, 4, 2, or 1"
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif  // PLATFORM_TYPES_H_
+
diff --git a/compiler/tools/fpp-to-cpp/test/fprime/config/FpConfig.fpp b/compiler/tools/fpp-to-cpp/test/fprime/config/FpConfig.fpp
index f4c2b2b3a..7eb51104a 100644
--- a/compiler/tools/fpp-to-cpp/test/fprime/config/FpConfig.fpp
+++ b/compiler/tools/fpp-to-cpp/test/fprime/config/FpConfig.fpp
@@ -1,17 +1,85 @@
-type FwBuffSizeType
-type FwChanIdType
-type FwDpIdType
-type FwDpPriorityType
-type FwEnumStoreType
-type FwEventIdType
-type FwIndexType
-type FwOpcodeType
-type FwPacketDescriptorType
-type FwPrmIdType
-type FwSizeStoreType
-type FwSizeType
-type FwTimeBaseStoreType
-type FwTimeContextStoreType
-type FwTlmPacketizeIdType
-type FwTraceIdType
-type POINTER_CAST
+# ======================================================================
+# \title  Fw/FPrimeBasicTypes.hpp
+# \author tumbar, mstarch
+# \brief  FPP alias configuration file
+#
+# \copyright
+# Copyright 2025, by the California Institute of Technology.
+# ALL RIGHTS RESERVED.  United States Government Sponsorship
+# acknowledged.
+#
+# FPrime uses FPP to define a set of type aliases for various named types
+# used throughout the system. This file is used to configure those types.
+# ======================================================================
+
+####
+# Interger type aliases:
+# Used for the project to override types supplied by the platform for things like sizes, indicies, etc.
+####
+
+@ The unsigned type of larger sizes internal to the software,
+@ e.g., memory buffer sizes, file sizes. Must be unsigned.
+type FwSizeType = PlatformSizeType
+
+@ The signed type of larger sizes internal to the software, used
+@ for signed offsets, e.g., file seek offsets. Must be signed.
+type FwSignedSizeType = PlatformSignedSizeType
+
+@ The type of smaller indicies internal to the software, used
+@ for array indicies, e.g., port indicies. Must be signed.
+type FwIndexType = PlatformIndexType
+
+@ The type of arguments to assert functions.
+type FwAssertArgType = PlatformAssertArgType
+
+@ The type of task priorities used.
+type FwTaskPriorityType = PlatformTaskPriorityType;
+
+@ The type of queue priorities used.
+type FwQueuePriorityType = PlatformQueuePriorityType
+
+
+####
+# GDS type aliases:
+# Used for the project to override types shared with GDSes and other remote systems.
+####
+
+@ The type of a telemetry channel identifier
+type FwChanIdType = U32
+
+@ The type of a data product identifier
+type FwDpIdType = U32
+
+@ The type of a data product priority
+type FwDpPriorityType = U32
+
+@ The type of an event identifier
+type FwEventIdType = U32
+
+@ The type of a command opcode
+type FwOpcodeType = U32
+
+@ The type of a com packet descriptor
+type FwPacketDescriptorType = U32
+
+@ The type of a parameter identifier
+type FwPrmIdType = U32
+
+@ The type used to serialize a size value
+type FwSizeStoreType = U16
+
+@ The type used to serialize a time base value
+type FwTimeBaseStoreType = U16
+
+@ The type used to serialize a time context value
+type FwTimeContextStoreType = U8
+
+@ The type of a telemetry packet identifier
+type FwTlmPacketizeIdType = U16
+
+@ The type of a trace identifier
+type FwTraceIdType = U32
+
+@ The type used to serialize a C++ enumeration constant
+@ FPP enumerations are serialized according to their representation types
+type FwEnumStoreType = I32
diff --git a/compiler/tools/fpp-to-cpp/test/fprime/generate_cpp b/compiler/tools/fpp-to-cpp/test/fprime/generate_cpp
index 0da96fd4e..bf5358d9e 100755
--- a/compiler/tools/fpp-to-cpp/test/fprime/generate_cpp
+++ b/compiler/tools/fpp-to-cpp/test/fprime/generate_cpp
@@ -20,6 +20,53 @@ do
   done
 done
 
+# Move Fw aliases (FpConfig.h dependencies) into config
+fp_config_aliases="
+FwAssertArgType
+FwChanIdType
+FwDpIdType
+FwDpPriorityType
+FwEnumStoreType
+FwEventIdType
+FwIndexType
+FwOpcodeType
+FwPacketDescriptorType
+FwPrmIdType
+FwQueuePriorityType
+FwSignedSizeType
+FwSizeStoreType
+FwSizeType
+FwTaskPriorityType
+FwTimeBaseStoreType
+FwTimeContextStoreType
+FwTlmPacketizeIdType
+FwTraceIdType
+"
+fp_platform_aliases="
+PlatformSizeType
+PlatformSignedSizeType
+PlatformIndexType
+PlatformAssertArgType
+PlatformTaskPriorityType
+PlatformQueuePriorityType
+"
+
+for base in ${fp_config_aliases}
+do
+  for suffix in hpp h
+  do
+    mv ${base}AliasAc.$suffix config
+  done
+done
+
+for base in ${fp_platform_aliases}
+do
+  for suffix in hpp h
+  do
+    mv ${base}AliasAc.$suffix Platform
+  done
+done
+
 # Move files into place by name prefix
 for dir in Buffer Cmd Dp Log Prm Time Tlm
 do
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 2dae1c71b..66d4badb9 100644
--- a/compiler/tools/fpp-to-cpp/test/port/AbsTypePortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/port/AbsTypePortAc.ref.hpp
@@ -9,9 +9,9 @@
 
 #include <cstdio>
 #include <cstring>
-#include <FpConfig.hpp>
 
 #include "Fw/Comp/PassiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/Serializable.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/port/BuiltInTypePortAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/port/BuiltInTypePortAc.ref.cpp
deleted file mode 100644
index 05b9ce818..000000000
--- a/compiler/tools/fpp-to-cpp/test/port/BuiltInTypePortAc.ref.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-// ======================================================================
-// \title  BuiltInTypePortAc.cpp
-// \author Generated by fpp-to-cpp
-// \brief  cpp file for BuiltInType port
-// ======================================================================
-
-#include "BuiltInTypePortAc.hpp"
-#include "Fw/Types/Assert.hpp"
-#include "Fw/Types/ExternalString.hpp"
-
-namespace {
-
-  // ----------------------------------------------------------------------
-  // Port buffer class
-  // ----------------------------------------------------------------------
-
-  class BuiltInTypePortBuffer : public Fw::SerializeBufferBase {
-
-    public:
-
-      Fw::Serializable::SizeType getBuffCapacity() const {
-        return InputBuiltInTypePort::SERIALIZED_SIZE;
-      }
-
-      U8* getBuffAddr() {
-        return m_buff;
-      }
-
-      const U8* getBuffAddr() const {
-        return m_buff;
-      }
-
-    private:
-
-      U8 m_buff[InputBuiltInTypePort::SERIALIZED_SIZE];
-
-  };
-
-}
-
-// ----------------------------------------------------------------------
-// Input Port Member functions
-// ----------------------------------------------------------------------
-
-InputBuiltInTypePort ::
-  InputBuiltInTypePort() :
-    Fw::InputPortBase(),
-    m_func(nullptr)
-{
-
-}
-
-void InputBuiltInTypePort ::
-  init()
-{
-  Fw::InputPortBase::init();
-}
-
-void InputBuiltInTypePort ::
-  addCallComp(
-      Fw::PassiveComponentBase* callComp,
-      CompFuncPtr funcPtr
-  )
-{
-  FW_ASSERT(callComp != nullptr);
-  FW_ASSERT(funcPtr != nullptr);
-
-  this->m_comp = callComp;
-  this->m_func = funcPtr;
-  this->m_connObj = callComp;
-}
-
-void InputBuiltInTypePort ::
-  invoke(
-      FwOpcodeType t,
-      FwOpcodeType& tRef
-  )
-{
-#if FW_PORT_TRACING == 1
-  this->trace();
-#endif
-
-  FW_ASSERT(this->m_comp != nullptr);
-  FW_ASSERT(this->m_func != nullptr);
-
-  return this->m_func(this->m_comp, this->m_portNum, t, tRef);
-}
-
-#if FW_PORT_SERIALIZATION == 1
-
-Fw::SerializeStatus InputBuiltInTypePort ::
-  invokeSerial(Fw::SerializeBufferBase& _buffer)
-{
-  Fw::SerializeStatus _status;
-
-#if FW_PORT_TRACING == 1
-  this->trace();
-#endif
-
-  FW_ASSERT(this->m_comp != nullptr);
-  FW_ASSERT(this->m_func != nullptr);
-
-  FwOpcodeType t;
-  _status = _buffer.deserialize(t);
-  if (_status != Fw::FW_SERIALIZE_OK) {
-    return _status;
-  }
-
-  FwOpcodeType tRef;
-  _status = _buffer.deserialize(tRef);
-  if (_status != Fw::FW_SERIALIZE_OK) {
-    return _status;
-  }
-
-  this->m_func(this->m_comp, this->m_portNum, t, tRef);
-
-  return Fw::FW_SERIALIZE_OK;
-}
-
-#endif
-
-// ----------------------------------------------------------------------
-// Output Port Member functions
-// ----------------------------------------------------------------------
-
-OutputBuiltInTypePort ::
-  OutputBuiltInTypePort() :
-    Fw::OutputPortBase(),
-    m_port(nullptr)
-{
-
-}
-
-void OutputBuiltInTypePort ::
-  init()
-{
-  Fw::OutputPortBase::init();
-}
-
-void OutputBuiltInTypePort ::
-  addCallPort(InputBuiltInTypePort* callPort)
-{
-  FW_ASSERT(callPort != nullptr);
-
-  this->m_port = callPort;
-  this->m_connObj = callPort;
-
-#if FW_PORT_SERIALIZATION == 1
-  this->m_serPort = nullptr;
-#endif
-}
-
-void OutputBuiltInTypePort ::
-  invoke(
-      FwOpcodeType t,
-      FwOpcodeType& tRef
-  ) const
-{
-#if FW_PORT_TRACING == 1
-  this->trace();
-#endif
-
-#if FW_PORT_SERIALIZATION
-  FW_ASSERT((this->m_port != nullptr) || (this->m_serPort != nullptr));
-
-  if (this->m_port != nullptr) {
-    this->m_port->invoke(t, tRef);
-  }
-  else {
-    Fw::SerializeStatus _status;
-    BuiltInTypePortBuffer _buffer;
-
-    _status = _buffer.serialize(t);
-    FW_ASSERT(_status == Fw::FW_SERIALIZE_OK, static_cast<FwAssertArgType>(_status));
-
-    _status = _buffer.serialize(tRef);
-    FW_ASSERT(_status == Fw::FW_SERIALIZE_OK, static_cast<FwAssertArgType>(_status));
-
-    _status = this->m_serPort->invokeSerial(_buffer);
-    FW_ASSERT(_status == Fw::FW_SERIALIZE_OK, static_cast<FwAssertArgType>(_status));
-  }
-#else
-  FW_ASSERT(this->m_port != nullptr);
-  this->m_port->invoke(t, tRef);
-#endif
-}
diff --git a/compiler/tools/fpp-to-cpp/test/port/BuiltInTypePortAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/port/BuiltInTypePortAc.ref.hpp
deleted file mode 100644
index d81069c34..000000000
--- a/compiler/tools/fpp-to-cpp/test/port/BuiltInTypePortAc.ref.hpp
+++ /dev/null
@@ -1,137 +0,0 @@
-// ======================================================================
-// \title  BuiltInTypePortAc.hpp
-// \author Generated by fpp-to-cpp
-// \brief  hpp file for BuiltInType port
-// ======================================================================
-
-#ifndef BuiltInTypePortAc_HPP
-#define BuiltInTypePortAc_HPP
-
-#include <cstdio>
-#include <cstring>
-#include <FpConfig.hpp>
-
-#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"
-
-//! Input BuiltInType port
-//! A port with built-in type parameters
-class InputBuiltInTypePort :
-  public Fw::InputPortBase
-{
-
-  public:
-
-    // ----------------------------------------------------------------------
-    // Constants
-    // ----------------------------------------------------------------------
-
-    enum {
-      //! The size of the serial representations of the port arguments
-      SERIALIZED_SIZE =
-        sizeof(FwOpcodeType) +
-        sizeof(FwOpcodeType)
-    };
-
-  public:
-
-    // ----------------------------------------------------------------------
-    // Types
-    // ----------------------------------------------------------------------
-
-    //! The port callback function type
-    typedef void (*CompFuncPtr)(
-      Fw::PassiveComponentBase* callComp,
-      FwIndexType portNum,
-      FwOpcodeType t,
-      FwOpcodeType& tRef
-    );
-
-  public:
-
-    // ----------------------------------------------------------------------
-    // Input Port Member functions
-    // ----------------------------------------------------------------------
-
-    //! Constructor
-    InputBuiltInTypePort();
-
-    //! Initialization function
-    void init();
-
-    //! Register a component
-    void addCallComp(
-        Fw::PassiveComponentBase* callComp, //!< The containing component
-        CompFuncPtr funcPtr //!< The port callback function
-    );
-
-    //! Invoke a port interface
-    void invoke(
-        FwOpcodeType t,
-        FwOpcodeType& tRef
-    );
-
-  private:
-
-#if FW_PORT_SERIALIZATION == 1
-
-    //! Invoke the port with serialized arguments
-    Fw::SerializeStatus invokeSerial(Fw::SerializeBufferBase& _buffer);
-
-#endif
-
-  private:
-
-    // ----------------------------------------------------------------------
-    // Member variables
-    // ----------------------------------------------------------------------
-
-    //! The pointer to the port callback function
-    CompFuncPtr m_func;
-
-};
-
-//! Output BuiltInType port
-//! A port with built-in type parameters
-class OutputBuiltInTypePort :
-  public Fw::OutputPortBase
-{
-
-  public:
-
-    // ----------------------------------------------------------------------
-    // Output Port Member functions
-    // ----------------------------------------------------------------------
-
-    //! Constructor
-    OutputBuiltInTypePort();
-
-    //! Initialization function
-    void init();
-
-    //! Register an input port
-    void addCallPort(
-        InputBuiltInTypePort* callPort //!< The input port
-    );
-
-    //! Invoke a port interface
-    void invoke(
-        FwOpcodeType t,
-        FwOpcodeType& tRef
-    ) const;
-
-  private:
-
-    // ----------------------------------------------------------------------
-    // Member variables
-    // ----------------------------------------------------------------------
-
-    //! The pointer to the input port
-    InputBuiltInTypePort* m_port;
-
-};
-
-#endif
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 e3082e179..2aed5a1f2 100644
--- a/compiler/tools/fpp-to-cpp/test/port/EmptyPortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/port/EmptyPortAc.ref.hpp
@@ -9,9 +9,9 @@
 
 #include <cstdio>
 #include <cstring>
-#include <FpConfig.hpp>
 
 #include "Fw/Comp/PassiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/Serializable.hpp"
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 b058daed0..a5172337e 100644
--- a/compiler/tools/fpp-to-cpp/test/port/FppTypePortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/port/FppTypePortAc.ref.hpp
@@ -9,11 +9,11 @@
 
 #include <cstdio>
 #include <cstring>
-#include <FpConfig.hpp>
 
 #include "AArrayAc.hpp"
 #include "EEnumAc.hpp"
 #include "Fw/Comp/PassiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/Serializable.hpp"
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 010d04067..25b34e0b5 100644
--- a/compiler/tools/fpp-to-cpp/test/port/KwdNamePortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/port/KwdNamePortAc.ref.hpp
@@ -9,9 +9,9 @@
 
 #include <cstdio>
 #include <cstring>
-#include <FpConfig.hpp>
 
 #include "Fw/Comp/PassiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/Serializable.hpp"
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 35d55598f..83501bfe0 100644
--- a/compiler/tools/fpp-to-cpp/test/port/PrimitivePortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/port/PrimitivePortAc.ref.hpp
@@ -9,9 +9,9 @@
 
 #include <cstdio>
 #include <cstring>
-#include <FpConfig.hpp>
 
 #include "Fw/Comp/PassiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/Serializable.hpp"
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 8692f960c..9a4cbee67 100644
--- a/compiler/tools/fpp-to-cpp/test/port/ReturnTypePortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/port/ReturnTypePortAc.ref.hpp
@@ -9,9 +9,9 @@
 
 #include <cstdio>
 #include <cstring>
-#include <FpConfig.hpp>
 
 #include "Fw/Comp/PassiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/String.hpp"
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 83e6693e3..57bcce494 100644
--- a/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/port/StringPortAc.ref.hpp
@@ -9,9 +9,9 @@
 
 #include <cstdio>
 #include <cstring>
-#include <FpConfig.hpp>
 
 #include "Fw/Comp/PassiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/Serializable.hpp"
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 0f6af34d4..300f36565 100644
--- a/compiler/tools/fpp-to-cpp/test/port/StringReturnTypePortAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/port/StringReturnTypePortAc.ref.hpp
@@ -9,9 +9,9 @@
 
 #include <cstdio>
 #include <cstring>
-#include <FpConfig.hpp>
 
 #include "Fw/Comp/PassiveComponentBase.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Port/InputPortBase.hpp"
 #include "Fw/Port/OutputPortBase.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/port/builtin_type.fpp b/compiler/tools/fpp-to-cpp/test/port/builtin_type.fpp
deleted file mode 100644
index e895db1f9..000000000
--- a/compiler/tools/fpp-to-cpp/test/port/builtin_type.fpp
+++ /dev/null
@@ -1,7 +0,0 @@
-type FwOpcodeType
-
-@ A port with built-in type parameters
-port BuiltInType(
-  t: FwOpcodeType,
-  ref tRef: FwOpcodeType
-)
diff --git a/compiler/tools/fpp-to-cpp/test/port/builtin_type.ref.txt b/compiler/tools/fpp-to-cpp/test/port/builtin_type.ref.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/compiler/tools/fpp-to-cpp/test/port/check-cpp b/compiler/tools/fpp-to-cpp/test/port/check-cpp
index e06fac9c1..6c3ae80ab 100755
--- a/compiler/tools/fpp-to-cpp/test/port/check-cpp
+++ b/compiler/tools/fpp-to-cpp/test/port/check-cpp
@@ -15,5 +15,5 @@ do
   cp $base.ref.hpp $base.hpp
   cp $base.ref.cpp $base.cpp
   echo "compiling $base.cpp"
-  $fprime_gcc -DFW_PORT_TRACING=1 -DFW_PORT_SERIALIZATION=1 -I../fprime/config -c $base.cpp
+  $fprime_gcc -DFW_PORT_TRACING=1 -DFW_PORT_SERIALIZATION=1 -I../fprime -c $base.cpp
 done
diff --git a/compiler/tools/fpp-to-cpp/test/port/run.sh b/compiler/tools/fpp-to-cpp/test/port/run.sh
index 0619abc0d..0d822903a 100644
--- a/compiler/tools/fpp-to-cpp/test/port/run.sh
+++ b/compiler/tools/fpp-to-cpp/test/port/run.sh
@@ -4,12 +4,6 @@ abs_type()
     diff_cpp AbsTypePort
 }
 
-builtin_type()
-{
-  run_test "-p $PWD" builtin_type && \
-    diff_cpp BuiltInTypePort
-}
-
 empty()
 {
   run_test "-p $PWD" empty && \
diff --git a/compiler/tools/fpp-to-cpp/test/port/tests.sh b/compiler/tools/fpp-to-cpp/test/port/tests.sh
index 2b82ca9a6..fed695864 100644
--- a/compiler/tools/fpp-to-cpp/test/port/tests.sh
+++ b/compiler/tools/fpp-to-cpp/test/port/tests.sh
@@ -1,6 +1,5 @@
 tests="
 abs_type
-builtin_type
 duplicate
 empty
 fpp_type
diff --git a/compiler/tools/fpp-to-cpp/test/port/update-ref.sh b/compiler/tools/fpp-to-cpp/test/port/update-ref.sh
index c1cfbf6ef..c793ff381 100644
--- a/compiler/tools/fpp-to-cpp/test/port/update-ref.sh
+++ b/compiler/tools/fpp-to-cpp/test/port/update-ref.sh
@@ -4,12 +4,6 @@ abs_type()
   move_cpp AbsTypePort
 }
 
-builtin_type()
-{
-  update "-p $PWD" builtin_type
-  move_cpp BuiltInTypePort
-}
-
 empty()
 {
   update "-p $PWD" empty
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/choice/BasicStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/choice/BasicStateMachineAc.ref.hpp
index 75a0374e2..12eff83fb 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/choice/BasicStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/choice/BasicStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmChoice_BasicStateMachineAc_HPP
 #define FppTest_SmChoice_BasicStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/choice/BasicU32StateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/choice/BasicU32StateMachineAc.ref.hpp
index 998a4a127..98cf16595 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/choice/BasicU32StateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/choice/BasicU32StateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmChoice_BasicU32StateMachineAc_HPP
 #define FppTest_SmChoice_BasicU32StateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/choice/ChoiceToChoiceStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/choice/ChoiceToChoiceStateMachineAc.ref.hpp
index dedf09524..ca584270b 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/choice/ChoiceToChoiceStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/choice/ChoiceToChoiceStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmChoice_ChoiceToChoiceStateMachineAc_HPP
 #define FppTest_SmChoice_ChoiceToChoiceStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/choice/ChoiceToStateStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/choice/ChoiceToStateStateMachineAc.ref.hpp
index 87b2b38aa..5ecd79c71 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/choice/ChoiceToStateStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/choice/ChoiceToStateStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmChoice_ChoiceToStateStateMachineAc_HPP
 #define FppTest_SmChoice_ChoiceToStateStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/choice/InputPairU16U32StateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/choice/InputPairU16U32StateMachineAc.ref.hpp
index 1d0af6450..a4ddc62f8 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/choice/InputPairU16U32StateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/choice/InputPairU16U32StateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmChoice_InputPairU16U32StateMachineAc_HPP
 #define FppTest_SmChoice_InputPairU16U32StateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/choice/SequenceStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/choice/SequenceStateMachineAc.ref.hpp
index 03bee4e07..a963628c1 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/choice/SequenceStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/choice/SequenceStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmChoice_SequenceStateMachineAc_HPP
 #define FppTest_SmChoice_SequenceStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/choice/SequenceU32StateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/choice/SequenceU32StateMachineAc.ref.hpp
index 82e31d3bd..ff501519c 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/choice/SequenceU32StateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/choice/SequenceU32StateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmChoice_SequenceU32StateMachineAc_HPP
 #define FppTest_SmChoice_SequenceU32StateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/choice/check-cpp b/compiler/tools/fpp-to-cpp/test/state-machine/choice/check-cpp
index 8783299b1..14f092d77 100755
--- a/compiler/tools/fpp-to-cpp/test/state-machine/choice/check-cpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/choice/check-cpp
@@ -12,5 +12,5 @@ do
   cp $base.ref.hpp $base.hpp
   cp $base.ref.cpp $base.cpp
   echo "compiling $base.cpp"
-  $fprime_gcc -Wno-unused-parameter -I../.. -I../../fprime/config -c $base.cpp
+  $fprime_gcc -Wno-unused-parameter -I../.. -I../../fprime -c $base.cpp
 done
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/harness/generate-cpp b/compiler/tools/fpp-to-cpp/test/state-machine/harness/generate-cpp
index ef788b0a5..06e046ccf 100755
--- a/compiler/tools/fpp-to-cpp/test/state-machine/harness/generate-cpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/harness/generate-cpp
@@ -2,10 +2,10 @@
 
 cd `dirname $0`
 
+fpp_to_cpp=../../../../../bin/fpp-to-cpp
 echo "generating C++ files for harness"
 
 state_machine=`dirname $PWD`
 harness=$state_machine/harness
 fpp_flags="-p $state_machine"
-fpp_to_cpp=../../../../../bin/fpp-to-cpp
 $fpp_to_cpp $fpp_flags harness.fpp
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/initial/BasicStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/initial/BasicStateMachineAc.ref.hpp
index 584644157..b5385c789 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/initial/BasicStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/initial/BasicStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmInitial_BasicStateMachineAc_HPP
 #define FppTest_SmInitial_BasicStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/initial/ChoiceStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/initial/ChoiceStateMachineAc.ref.hpp
index 36d8d0eef..28d6f0e5e 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/initial/ChoiceStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/initial/ChoiceStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmInitial_ChoiceStateMachineAc_HPP
 #define FppTest_SmInitial_ChoiceStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/initial/NestedStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/initial/NestedStateMachineAc.ref.hpp
index 9fe85bfc3..adcc28e6a 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/initial/NestedStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/initial/NestedStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmInitial_NestedStateMachineAc_HPP
 #define FppTest_SmInitial_NestedStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/initial/check-cpp b/compiler/tools/fpp-to-cpp/test/state-machine/initial/check-cpp
index 0e3970b78..f63851b31 100755
--- a/compiler/tools/fpp-to-cpp/test/state-machine/initial/check-cpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/initial/check-cpp
@@ -10,5 +10,5 @@ do
   cp $base.ref.hpp $base.hpp
   cp $base.ref.cpp $base.cpp
   echo "compiling $base.cpp"
-  $fprime_gcc -I../../fprime/config -c $base.cpp
+  $fprime_gcc -I../../fprime -c $base.cpp
 done
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardStateMachineAc.ref.hpp
index 5022dd8e3..9c15290b7 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_BasicGuardStateMachineAc_HPP
 #define FppTest_SmState_BasicGuardStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardStringStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardStringStateMachineAc.ref.hpp
index 91e0e7af5..72aaea11b 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardStringStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardStringStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_BasicGuardStringStateMachineAc_HPP
 #define FppTest_SmState_BasicGuardStringStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardTestAbsTypeStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardTestAbsTypeStateMachineAc.ref.hpp
index 1109ffab9..8ff92b8af 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardTestAbsTypeStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardTestAbsTypeStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_BasicGuardTestAbsTypeStateMachineAc_HPP
 #define FppTest_SmState_BasicGuardTestAbsTypeStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardTestArrayStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardTestArrayStateMachineAc.ref.hpp
index 239b48a5a..266472bc4 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardTestArrayStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardTestArrayStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_BasicGuardTestArrayStateMachineAc_HPP
 #define FppTest_SmState_BasicGuardTestArrayStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardTestEnumStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardTestEnumStateMachineAc.ref.hpp
index 6eac1e9f3..c4a1b4f93 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardTestEnumStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardTestEnumStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_BasicGuardTestEnumStateMachineAc_HPP
 #define FppTest_SmState_BasicGuardTestEnumStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardTestStructStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardTestStructStateMachineAc.ref.hpp
index 8d302ff93..f71e9b12c 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardTestStructStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardTestStructStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_BasicGuardTestStructStateMachineAc_HPP
 #define FppTest_SmState_BasicGuardTestStructStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardU32StateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardU32StateMachineAc.ref.hpp
index c5da92cd0..cc9174ef2 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardU32StateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicGuardU32StateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_BasicGuardU32StateMachineAc_HPP
 #define FppTest_SmState_BasicGuardU32StateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicInternalStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicInternalStateMachineAc.ref.hpp
index 59ada4314..dbf73e628 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicInternalStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicInternalStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_BasicInternalStateMachineAc_HPP
 #define FppTest_SmState_BasicInternalStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicSelfStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicSelfStateMachineAc.ref.hpp
index 24def694c..3a86952a3 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicSelfStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicSelfStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_BasicSelfStateMachineAc_HPP
 #define FppTest_SmState_BasicSelfStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicStateMachineAc.ref.hpp
index ad6fc9cd7..2f6b20305 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_BasicStateMachineAc_HPP
 #define FppTest_SmState_BasicStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicStringStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicStringStateMachineAc.ref.hpp
index d21018819..72f8ac428 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicStringStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicStringStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_BasicStringStateMachineAc_HPP
 #define FppTest_SmState_BasicStringStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicTestAbsTypeStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicTestAbsTypeStateMachineAc.ref.hpp
index f22218333..f481391ad 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicTestAbsTypeStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicTestAbsTypeStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_BasicTestAbsTypeStateMachineAc_HPP
 #define FppTest_SmState_BasicTestAbsTypeStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicTestArrayStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicTestArrayStateMachineAc.ref.hpp
index ab7026baa..7410b7d10 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicTestArrayStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicTestArrayStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_BasicTestArrayStateMachineAc_HPP
 #define FppTest_SmState_BasicTestArrayStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicTestEnumStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicTestEnumStateMachineAc.ref.hpp
index 6d6620bd1..fde3f6a9a 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicTestEnumStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicTestEnumStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_BasicTestEnumStateMachineAc_HPP
 #define FppTest_SmState_BasicTestEnumStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicTestStructStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicTestStructStateMachineAc.ref.hpp
index 64039d04d..0758e98fa 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicTestStructStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicTestStructStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_BasicTestStructStateMachineAc_HPP
 #define FppTest_SmState_BasicTestStructStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicU32StateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicU32StateMachineAc.ref.hpp
index 34a225067..4ddfa8690 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicU32StateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/BasicU32StateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_BasicU32StateMachineAc_HPP
 #define FppTest_SmState_BasicU32StateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/InternalStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/InternalStateMachineAc.ref.hpp
index 0d55d7fe6..a34ab5049 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/InternalStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/InternalStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_InternalStateMachineAc_HPP
 #define FppTest_SmState_InternalStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/PolymorphismStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/PolymorphismStateMachineAc.ref.hpp
index 0af391e33..c28d54b60 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/PolymorphismStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/PolymorphismStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_PolymorphismStateMachineAc_HPP
 #define FppTest_SmState_PolymorphismStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/StateToChildStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/StateToChildStateMachineAc.ref.hpp
index f1656cccb..33cb3212a 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/StateToChildStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/StateToChildStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_StateToChildStateMachineAc_HPP
 #define FppTest_SmState_StateToChildStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/StateToChoiceStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/StateToChoiceStateMachineAc.ref.hpp
index c70a0cf4c..520a2b8e0 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/StateToChoiceStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/StateToChoiceStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_StateToChoiceStateMachineAc_HPP
 #define FppTest_SmState_StateToChoiceStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/StateToSelfStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/StateToSelfStateMachineAc.ref.hpp
index c928e3586..c3146286d 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/StateToSelfStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/StateToSelfStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_StateToSelfStateMachineAc_HPP
 #define FppTest_SmState_StateToSelfStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/StateToStateStateMachineAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/StateToStateStateMachineAc.ref.hpp
index baf2ed6de..415c2d250 100644
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/StateToStateStateMachineAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/StateToStateStateMachineAc.ref.hpp
@@ -7,8 +7,7 @@
 #ifndef FppTest_SmState_StateToStateStateMachineAc_HPP
 #define FppTest_SmState_StateToStateStateMachineAc_HPP
 
-#include <FpConfig.hpp>
-
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/state-machine/state/check-cpp b/compiler/tools/fpp-to-cpp/test/state-machine/state/check-cpp
index 8783299b1..14f092d77 100755
--- a/compiler/tools/fpp-to-cpp/test/state-machine/state/check-cpp
+++ b/compiler/tools/fpp-to-cpp/test/state-machine/state/check-cpp
@@ -12,5 +12,5 @@ do
   cp $base.ref.hpp $base.hpp
   cp $base.ref.cpp $base.cpp
   echo "compiling $base.cpp"
-  $fprime_gcc -Wno-unused-parameter -I../.. -I../../fprime/config -c $base.cpp
+  $fprime_gcc -Wno-unused-parameter -I../.. -I../../fprime -c $base.cpp
 done
diff --git a/compiler/tools/fpp-to-cpp/test/struct/AbsTypeSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/AbsTypeSerializableAc.ref.hpp
index 3f010b91c..23108f548 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/AbsTypeSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/AbsTypeSerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef AbsTypeSerializableAc_HPP
 #define AbsTypeSerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/AliasTypeSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/AliasTypeSerializableAc.ref.hpp
index 24e283bbe..0bbdfd877 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/AliasTypeSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/AliasTypeSerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef AliasTypeSerializableAc_HPP
 #define AliasTypeSerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/C_SSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/C_SSerializableAc.ref.hpp
index 313b26f12..518eb9ef8 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/C_SSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/C_SSerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef C_C_SSerializableAc_HPP
 #define C_C_SSerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.hpp
index e3d697ff7..c3c11d5d5 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef DefaultSerializableAc_HPP
 #define DefaultSerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/EEnumAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/EEnumAc.ref.hpp
index 0eb6cd229..f7f199ec3 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/EEnumAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/EEnumAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_EEnumAc_HPP
 #define M_EEnumAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
diff --git a/compiler/tools/fpp-to-cpp/test/struct/EmptySerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/EmptySerializableAc.ref.hpp
index f391eedf0..f969cd4fa 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/EmptySerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/EmptySerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef EmptySerializableAc_HPP
 #define EmptySerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/EnumSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/EnumSerializableAc.ref.hpp
index 2cd11e86e..03a750433 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/EnumSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/EnumSerializableAc.ref.hpp
@@ -8,7 +8,7 @@
 #define EnumSerializableAc_HPP
 
 #include "EEnumAc.hpp"
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/FormatSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/FormatSerializableAc.ref.hpp
index c39e3540e..98331de5f 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/FormatSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/FormatSerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef FormatSerializableAc_HPP
 #define FormatSerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/IncludedSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/IncludedSerializableAc.ref.hpp
index 7ad7c4a76..f570d5a7b 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/IncludedSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/IncludedSerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef IncludedSerializableAc_HPP
 #define IncludedSerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/IncludingSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/IncludingSerializableAc.ref.hpp
index 9ba02d637..578ae4abd 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/IncludingSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/IncludingSerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef IncludingSerializableAc_HPP
 #define IncludingSerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/Modules1SerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/Modules1SerializableAc.ref.hpp
index a6df379b3..3f6bd1086 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/Modules1SerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/Modules1SerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_Modules1SerializableAc_HPP
 #define M_Modules1SerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/Modules2SerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/Modules2SerializableAc.ref.hpp
index 4e212a218..f10e343c8 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/Modules2SerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/Modules2SerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef M_Modules2SerializableAc_HPP
 #define M_Modules2SerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/Modules3SerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/Modules3SerializableAc.ref.hpp
index 0c1c75667..3b6b5995a 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/Modules3SerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/Modules3SerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef Modules3SerializableAc_HPP
 #define Modules3SerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/Modules4SerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/Modules4SerializableAc.ref.hpp
index d5ceba16e..d9ed6389f 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/Modules4SerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/Modules4SerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef Modules4SerializableAc_HPP
 #define Modules4SerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.hpp
index b9f9924af..d0298ac78 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef PrimitiveSerializableAc_HPP
 #define PrimitiveSerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/PrimitiveStructSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/PrimitiveStructSerializableAc.ref.hpp
index 7edd9892f..da6ac1f20 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/PrimitiveStructSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/PrimitiveStructSerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef PrimitiveStructSerializableAc_HPP
 #define PrimitiveStructSerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/SSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/SSerializableAc.ref.hpp
index 4711483ab..9c9765e99 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/SSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/SSerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef SSerializableAc_HPP
 #define SSerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.hpp
index c97479704..b22061944 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef StringArraySerializableAc_HPP
 #define StringArraySerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.hpp
index 791a60fe0..7eff8d10d 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.hpp
@@ -7,7 +7,7 @@
 #ifndef StringSerializableAc_HPP
 #define StringSerializableAc_HPP
 
-#include "FpConfig.hpp"
+#include "Fw/FPrimeBasicTypes.hpp"
 #include "Fw/Types/ExternalString.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/TAliasAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/TAliasAliasAc.ref.hpp
index 91419246a..cb45ad153 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/TAliasAliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/TAliasAliasAc.ref.hpp
@@ -7,9 +7,7 @@
 #ifndef TAliasAliasAc_HPP
 #define TAliasAliasAc_HPP
 
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 #include "T.hpp"
 
 using TAlias = T;
diff --git a/compiler/tools/fpp-to-cpp/test/struct/U16AliasAliasAc.ref.h b/compiler/tools/fpp-to-cpp/test/struct/U16AliasAliasAc.ref.h
index 2127eee1b..bf4244c99 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/U16AliasAliasAc.ref.h
+++ b/compiler/tools/fpp-to-cpp/test/struct/U16AliasAliasAc.ref.h
@@ -7,11 +7,9 @@
 #ifndef U16AliasAliasAc_H
 #define U16AliasAliasAc_H
 
-#include <FpConfig.h>
-
 #include "Fw/Types/BasicTypes.h"
 
 typedef U16 U16Alias;
-#define PRI_U16Alias PRI_u16
+#define PRI_U16Alias PRI_U16
 
 #endif
diff --git a/compiler/tools/fpp-to-cpp/test/struct/U16AliasAliasAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/struct/U16AliasAliasAc.ref.hpp
index 93741a4af..1eacf9eca 100644
--- a/compiler/tools/fpp-to-cpp/test/struct/U16AliasAliasAc.ref.hpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/U16AliasAliasAc.ref.hpp
@@ -7,9 +7,7 @@
 #ifndef U16AliasAliasAc_HPP
 #define U16AliasAliasAc_HPP
 
-#include <FpConfig.hpp>
-
-#include "Fw/Types/BasicTypes.h"
+#include "Fw/Types/BasicTypes.hpp"
 
 extern "C" {
 #include "U16AliasAliasAc.h"
diff --git a/compiler/tools/fpp-to-cpp/test/struct/check-cpp b/compiler/tools/fpp-to-cpp/test/struct/check-cpp
index a77f91d1a..3b9af2e0b 100755
--- a/compiler/tools/fpp-to-cpp/test/struct/check-cpp
+++ b/compiler/tools/fpp-to-cpp/test/struct/check-cpp
@@ -16,5 +16,5 @@ do
   cp $base.ref.hpp $base.hpp
   cp $base.ref.cpp $base.cpp
   echo "compiling $base.cpp"
-  $fprime_gcc -I../fprime/config -c $base.cpp
+  $fprime_gcc -I../fprime -c $base.cpp
 done
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/check
index 38c1d37f0..4400bf9c0 100755
--- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/check
+++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/check
@@ -10,7 +10,7 @@ dir=`cd ../..; echo $PWD`
 fprime_dir=../../../fprime
 
 echo '  generating C++'
-$fpp_to_cpp -p $dir -i $fprime_dir/config/FpConfig.fpp,$fprime_dir/Fw/Prm/Prm.fpp,../../phases.fpp \
+$fpp_to_cpp -p $dir -i $fprime_dir/config/FpConfig.fpp,$fprime_dir/Platform/PlatformTypes.fpp,$fprime_dir/Fw/Prm/Prm.fpp,../../phases.fpp \
   $fprime_dir/Fw/Cmd/Cmd.fpp ../../commands.fpp
 for suffix in hpp cpp
 do
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/check
index 93be4a70b..878599066 100755
--- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/check
+++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/check
@@ -10,7 +10,7 @@ dir=`cd ../..; echo $PWD`
 fprime_dir=../../../fprime
 
 echo '  generating C++'
-$fpp_to_cpp -p $dir -i $fprime_dir/config/FpConfig.fpp,$fprime_dir/Fw/Prm/Prm.fpp,../../phases.fpp \
+$fpp_to_cpp -p $dir -i $fprime_dir/config/FpConfig.fpp,$fprime_dir/Platform/PlatformTypes.fpp,$fprime_dir/Fw/Prm/Prm.fpp,../../phases.fpp \
   $fprime_dir/Fw/Cmd/Cmd.fpp ../../params.fpp
 for suffix in hpp cpp
 do
diff --git a/compiler/tools/fpp-to-xml/test/array/BuiltInTypeArrayAi.ref.xml b/compiler/tools/fpp-to-xml/test/array/BuiltInTypeArrayAi.ref.xml
deleted file mode 100644
index 8ba1f7a69..000000000
--- a/compiler/tools/fpp-to-xml/test/array/BuiltInTypeArrayAi.ref.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- =====================================================================
-BuiltInTypeArrayAi.xml
-Generated by fpp-to-xml
-====================================================================== -->
-<array namespace="M" name="BuiltInType">
-  <type>FwOpcodeType</type>
-  <size>3</size>
-  <format>%s</format>
-  <default>
-    <value>0</value>
-    <value>0</value>
-    <value>0</value>
-  </default>
-</array>
diff --git a/compiler/tools/fpp-to-xml/test/array/built_in_type.fpp b/compiler/tools/fpp-to-xml/test/array/built_in_type.fpp
deleted file mode 100644
index 2bdd6fd5e..000000000
--- a/compiler/tools/fpp-to-xml/test/array/built_in_type.fpp
+++ /dev/null
@@ -1,7 +0,0 @@
-type FwOpcodeType
-
-module M {
-
-  array BuiltInType = [3] FwOpcodeType
-
-}
diff --git a/compiler/tools/fpp-to-xml/test/array/built_in_type.ref.txt b/compiler/tools/fpp-to-xml/test/array/built_in_type.ref.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/compiler/tools/fpp-to-xml/test/array/run.sh b/compiler/tools/fpp-to-xml/test/array/run.sh
index 3cabe7b48..da58b39ce 100644
--- a/compiler/tools/fpp-to-xml/test/array/run.sh
+++ b/compiler/tools/fpp-to-xml/test/array/run.sh
@@ -29,9 +29,3 @@ array_struct_member_array()
   run_test "-p $PWD" array_struct_member_array && \
     diff_xml ArrayStructMemberArraySerializable ArrayStructMemberArrayArray
 }
-
-built_in_type()
-{
-  run_test "-p $PWD" built_in_type && \
-    diff_xml BuiltInTypeArray
-}
diff --git a/compiler/tools/fpp-to-xml/test/array/tests.sh b/compiler/tools/fpp-to-xml/test/array/tests.sh
index fc0b2d209..51593a9b3 100644
--- a/compiler/tools/fpp-to-xml/test/array/tests.sh
+++ b/compiler/tools/fpp-to-xml/test/array/tests.sh
@@ -3,6 +3,5 @@ array_enum
 array_ok
 array_special_comment
 array_struct
-built_in_type
 array_struct_member_array
 "
diff --git a/compiler/tools/fpp-to-xml/test/array/update-ref.sh b/compiler/tools/fpp-to-xml/test/array/update-ref.sh
index 4aa7487b2..503fd764e 100644
--- a/compiler/tools/fpp-to-xml/test/array/update-ref.sh
+++ b/compiler/tools/fpp-to-xml/test/array/update-ref.sh
@@ -31,9 +31,3 @@ array_struct_member_array()
   update "-p $PWD" array_struct_member_array
   move_xml ArrayStructMemberArraySerializable ArrayStructMemberArrayArray
 }
-
-built_in_type()
-{
-  update "-p $PWD" built_in_type
-  move_xml BuiltInTypeArray
-}