tpm2: Adopt the directory structure of upstream code repo

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>

configure.ac

@@ -11,7 +11,7 @@ AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([foreign 1.6 subdir-objects])
+AM_INIT_AUTOMAKE([foreign 1.9 subdir-objects tar-pax])
 AM_SILENT_RULES([yes])
 
 LIBTPMS_VER_MAJOR=`echo $PACKAGE_VERSION | awk -F. '{print $1}'`

scripts/meld-all

@@ -86,7 +86,9 @@ main()
 			continue
 		fi
 
-		upstream=$(find "${TCG_TPM_HOME}" | grep -E "/${fname}\$")
+		fn=${f:${#1}}
+		upstream="${TCG_TPM_HOME}/${fn}"
+		#echo "$upstream"
 
 		if [ -n "${upstream}" ]; then
 			# find first empty line presumably after license

src/Makefile.am

@@ -186,134 +186,135 @@ libtpms_tpm2_la_CFLAGS += -D_POSIX_
 libtpms_tpm2_la_CFLAGS += -DTPM_POSIX
 
 libtpms_tpm2_la_SOURCES = \
-	tpm2/ACT_spt.c \
 	tpm2/ACTCommands.c \
-	tpm2/AlgorithmCap.c \
-	tpm2/AlgorithmTests.c \
 	tpm2/AsymmetricCommands.c \
 	tpm2/AttestationCommands.c \
-	tpm2/Attest_spt.c \
 	tpm2/AuditCommands.c \
-	tpm2/Bits.c \
-	tpm2/BnEccConstants.c \
-	tpm2/BnConvert.c \
-	tpm2/BnMath.c \
-	tpm2/BnMemory.c \
-	tpm2/Cancel.c \
 	tpm2/CapabilityCommands.c \
-	tpm2/Clock.c \
 	tpm2/ClockCommands.c \
-	tpm2/CommandAudit.c \
-	tpm2/CommandCodeAttributes.c \
-	tpm2/CommandDispatcher.c \
 	tpm2/ContextCommands.c \
-	tpm2/Context_spt.c \
-	tpm2/Create.c \
-	tpm2/CreateLoaded.c \
-	tpm2/CreatePrimary.c \
-	tpm2/CryptEccData.c \
-	tpm2/CryptSelfTest.c \
-	tpm2/CryptUtil.c \
-	tpm2/DA.c \
-	tpm2/DebugHelpers.c \
 	tpm2/DictionaryCommands.c \
-	tpm2/Duplicate.c \
 	tpm2/DuplicationCommands.c \
 	tpm2/EACommands.c \
-	tpm2/EncryptDecrypt_spt.c \
-	tpm2/Entity.c \
-	tpm2/Entropy.c \
 	tpm2/EphemeralCommands.c \
-	tpm2/ExecCommand.c \
-	tpm2/ExtraData.c \
-	tpm2/Failure.c \
-	tpm2/Global.c \
-	tpm2/Handle.c \
 	tpm2/HashCommands.c \
-	tpm2/Hierarchy.c \
 	tpm2/HierarchyCommands.c \
-	tpm2/Import.c \
-	tpm2/Init.c \
 	tpm2/IntegrityCommands.c \
-	tpm2/IoBuffers.c \
-	tpm2/Locality.c \
-	tpm2/LocalityPlat.c \
-	tpm2/MakeCredential.c \
 	tpm2/ManagementCommands.c \
-	tpm2/Manufacture.c \
-	tpm2/Marshal.c \
-	tpm2/MathOnByteBuffers.c \
-	tpm2/Memory.c \
 	tpm2/NVCommands.c \
-	tpm2/NvDynamic.c \
-	tpm2/NVMem.c \
-	tpm2/NvReserved.c \
-	tpm2/NVVirtual.c \
-	tpm2/NV_Read.c \
-	tpm2/NV_ReadPublic.c \
-	tpm2/NV_ReadPublic2.c \
-	tpm2/NV_spt.c \
-	tpm2/Object.c \
-	tpm2/ObjectChangeAuth.c \
 	tpm2/ObjectCommands.c \
-	tpm2/Object_spt.c \
-	tpm2/PCR.c \
-	tpm2/PCR_Read.c \
-	tpm2/PlatformACT.c \
-	tpm2/PlatformData.c \
-	tpm2/PlatformPcr.c \
-	tpm2/Policy_spt.c \
-	tpm2/PolicyAuthorize.c \
-	tpm2/PolicyAuthorizeNV.c \
-	tpm2/PolicyPCR.c \
-	tpm2/PolicySecret.c \
-	tpm2/PolicySigned.c \
-	tpm2/PolicyTicket.c \
-	tpm2/PolicyTransportSPDM.c \
-	tpm2/Power.c \
-	tpm2/PowerPlat.c \
-	tpm2/PP.c \
-	tpm2/PPPlat.c \
-	tpm2/PrimeData.c \
-	tpm2/PropertyCap.c \
-	tpm2/Quote.c \
 	tpm2/RandomCommands.c \
-	tpm2/ReadOnlyControl.c \
-	tpm2/Response.c \
-	tpm2/ResponseCodeProcessing.c \
-	tpm2/RunCommand.c \
-	tpm2/SecChannel.c \
-	tpm2/SelfTest.c \
-	tpm2/Session.c \
 	tpm2/SessionCommands.c \
-	tpm2/SessionProcess.c \
 	tpm2/SigningCommands.c \
 	tpm2/StartupCommands.c \
 	tpm2/SymmetricCommands.c \
 	tpm2/TestingCommands.c \
-	tpm2/Ticket.c \
-	tpm2/Time.c \
-	tpm2/TpmASN1.c \
-	tpm2/TpmBigNumThunks.c \
-	tpm2/TpmEcc_Signature_ECDAA.c \
-	tpm2/TpmEcc_Signature_ECDSA.c \
-	tpm2/TpmEcc_Signature_Schnorr.c \
-	tpm2/TpmEcc_Signature_SM2.c \
-	tpm2/TpmEcc_Signature_Util.c \
-	tpm2/TpmEcc_Util.c \
-	tpm2/TpmMath_Debug.c \
-	tpm2/TpmMath_Util.c \
-	tpm2/TpmSizeChecks.c \
-	tpm2/TPMCmdp.c \
-	tpm2/TpmFail.c \
-	tpm2/Unique.c \
+	tpm2/TPMCmd/Platform/src/Cancel.c \
+	tpm2/TPMCmd/Platform/src/Clock.c \
+	tpm2/TPMCmd/Platform/src/DebugHelpers.c \
+	tpm2/TPMCmd/Platform/src/Entropy.c \
+	tpm2/TPMCmd/Platform/src/ExtraData.c \
+	tpm2/TPMCmd/Platform/src/Failure.c \
+	tpm2/TPMCmd/Platform/src/Init.c \
+	tpm2/TPMCmd/Platform/src/LocalityPlat.c \
+	tpm2/TPMCmd/Platform/src/NVMem.c \
+	tpm2/TPMCmd/Platform/src/NVVirtual.c \
+	tpm2/TPMCmd/Platform/src/PlatformACT.c \
+	tpm2/TPMCmd/Platform/src/PlatformData.c \
+	tpm2/TPMCmd/Platform/src/PlatformPcr.c \
+	tpm2/TPMCmd/Platform/src/PowerPlat.c \
+	tpm2/TPMCmd/Platform/src/PPPlat.c \
+	tpm2/TPMCmd/Platform/src/RunCommand.c \
+	tpm2/TPMCmd/Platform/src/SelfTest.c \
+	tpm2/TPMCmd/Platform/src/Unique.c \
+	tpm2/TPMCmd/Platform/src/VendorInfo.c \
+	tpm2/TPMCmd/Simulator/src/TPMCmdp.c \
+	tpm2/TPMCmd/tpm/cryptolibs/EccRef/TpmEcc_Signature_ECDSA.c \
+	tpm2/TPMCmd/tpm/cryptolibs/RsaRef/PrimeData.c \
+	tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnConvert.c \
+	tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnEccConstants.c \
+	tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnMath.c \
+	tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnMemory.c \
+	tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/TpmBigNumThunks.c \
+	tpm2/TPMCmd/tpm/src/command/Attestation/Attest_spt.c \
+	tpm2/TPMCmd/tpm/src/command/Attestation/Quote.c \
+	tpm2/TPMCmd/tpm/src/command/ClockTimer/ACT_spt.c \
+	tpm2/TPMCmd/tpm/src/command/Context/Context_spt.c \
+	tpm2/TPMCmd/tpm/src/command/Duplication/Duplicate.c \
+	tpm2/TPMCmd/tpm/src/command/Duplication/Import.c \
+	tpm2/TPMCmd/tpm/src/command/EA/PolicyAuthorize.c \
+	tpm2/TPMCmd/tpm/src/command/EA/PolicyAuthorizeNV.c \
+	tpm2/TPMCmd/tpm/src/command/EA/PolicyPCR.c \
+	tpm2/TPMCmd/tpm/src/command/EA/PolicySecret.c \
+	tpm2/TPMCmd/tpm/src/command/EA/PolicySigned.c \
+	tpm2/TPMCmd/tpm/src/command/EA/Policy_spt.c \
+	tpm2/TPMCmd/tpm/src/command/EA/PolicyTicket.c \
+	tpm2/TPMCmd/tpm/src/command/EA/PolicyTransportSPDM.c \
+	tpm2/TPMCmd/tpm/src/command/Hierarchy/CreatePrimary.c \
+	tpm2/TPMCmd/tpm/src/command/Hierarchy/ReadOnlyControl.c \
+	tpm2/TPMCmd/tpm/src/command/NVStorage/NV_Read.c \
+	tpm2/TPMCmd/tpm/src/command/NVStorage/NV_ReadPublic2.c \
+	tpm2/TPMCmd/tpm/src/command/NVStorage/NV_ReadPublic.c \
+	tpm2/TPMCmd/tpm/src/command/NVStorage/NV_spt.c \
+	tpm2/TPMCmd/tpm/src/command/Object/Create.c \
+	tpm2/TPMCmd/tpm/src/command/Object/CreateLoaded.c \
+	tpm2/TPMCmd/tpm/src/command/Object/MakeCredential.c \
+	tpm2/TPMCmd/tpm/src/command/Object/ObjectChangeAuth.c \
+	tpm2/TPMCmd/tpm/src/command/Object/Object_spt.c \
+	tpm2/TPMCmd/tpm/src/command/PCR/PCR_Read.c \
+	tpm2/TPMCmd/tpm/src/command/Symmetric/EncryptDecrypt_spt.c \
+	tpm2/TPMCmd/tpm/src/crypt/AlgorithmTests.c \
+	tpm2/TPMCmd/tpm/src/crypt/CryptEccData.c \
+	tpm2/TPMCmd/tpm/src/crypt/CryptSelfTest.c \
+	tpm2/TPMCmd/tpm/src/crypt/CryptUtil.c \
+	tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Signature_ECDAA.c \
+	tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Signature_Schnorr.c \
+	tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Signature_SM2.c \
+	tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Signature_Util.c \
+	tpm2/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Util.c \
+	tpm2/TPMCmd/tpm/src/crypt/math/TpmMath_Debug.c \
+	tpm2/TPMCmd/tpm/src/crypt/math/TpmMath_Util.c \
+	tpm2/TPMCmd/tpm/src/crypt/Ticket.c \
+	tpm2/TPMCmd/tpm/src/events/_TPM_Init.c \
+	tpm2/TPMCmd/tpm/src/main/CommandDispatcher.c \
+	tpm2/TPMCmd/tpm/src/main/ExecCommand.c \
+	tpm2/TPMCmd/tpm/src/main/SessionProcess.c \
+	tpm2/TPMCmd/tpm/src/subsystem/CommandAudit.c \
+	tpm2/TPMCmd/tpm/src/subsystem/DA.c \
+	tpm2/TPMCmd/tpm/src/subsystem/Hierarchy.c \
+	tpm2/TPMCmd/tpm/src/subsystem/NvDynamic.c \
+	tpm2/TPMCmd/tpm/src/subsystem/NvReserved.c \
+	tpm2/TPMCmd/tpm/src/subsystem/Object.c \
+	tpm2/TPMCmd/tpm/src/subsystem/PCR.c \
+	tpm2/TPMCmd/tpm/src/subsystem/PP.c \
+	tpm2/TPMCmd/tpm/src/subsystem/Session.c \
+	tpm2/TPMCmd/tpm/src/subsystem/Time.c \
+	tpm2/TPMCmd/tpm/src/support/AlgorithmCap.c \
+	tpm2/TPMCmd/tpm/src/support/Bits.c \
+	tpm2/TPMCmd/tpm/src/support/CommandCodeAttributes.c \
+	tpm2/TPMCmd/tpm/src/support/Entity.c \
+	tpm2/TPMCmd/tpm/src/support/Global.c \
+	tpm2/TPMCmd/tpm/src/support/Handle.c \
+	tpm2/TPMCmd/tpm/src/support/IoBuffers.c \
+	tpm2/TPMCmd/tpm/src/support/Locality.c \
+	tpm2/TPMCmd/tpm/src/support/Manufacture.c \
+	tpm2/TPMCmd/tpm/src/support/Marshal.c \
+	tpm2/TPMCmd/tpm/src/support/MathOnByteBuffers.c \
+	tpm2/TPMCmd/tpm/src/support/Memory.c \
+	tpm2/TPMCmd/tpm/src/support/Power.c \
+	tpm2/TPMCmd/tpm/src/support/PropertyCap.c \
+	tpm2/TPMCmd/tpm/src/support/Response.c \
+	tpm2/TPMCmd/tpm/src/support/ResponseCodeProcessing.c \
+	tpm2/TPMCmd/tpm/src/support/SecChannel.c \
+	tpm2/TPMCmd/tpm/src/support/TpmFail.c \
+	tpm2/TPMCmd/tpm/src/support/TpmSizeChecks.c \
+	tpm2/TPMCmd/tpm/src/X509/TpmASN1.c \
+	tpm2/TPMCmd/tpm/src/X509/X509_ECC.c \
+	tpm2/TPMCmd/tpm/src/X509/X509_RSA.c \
+	tpm2/TPMCmd/tpm/src/X509/X509_spt.c \
+	tpm2/TPMCmd/TpmConfiguration/TpmVendorCommandHandlers/Vendor_TCG_Test.c \
 	tpm2/Unmarshal.c \
-	tpm2/VendorInfo.c \
-	tpm2/X509_ECC.c \
-	tpm2/X509_RSA.c \
-	tpm2/X509_spt.c \
-	tpm2/VendorCommands/Vendor_TCG_Test.c \
-	tpm2/_TPM_Init.c \
+	\
 	tpm_tpm2_interface.c \
 	tpm_tpm2_tis.c \
 	\
@@ -330,283 +331,282 @@ libtpms_tpm2_la_SOURCES = \
 
 noinst_HEADERS += \
 	compiler.h \
-	tpm2/crypto/CryptCmac_fp.h \
-	tpm2/crypto/CryptDes_fp.h \
-	tpm2/crypto/CryptEcc.h \
-	tpm2/crypto/CryptEccCrypt_fp.h \
-	tpm2/crypto/CryptEccKeyExchange_fp.h \
-	tpm2/crypto/CryptEccMain_fp.h \
-	tpm2/crypto/CryptEccSignature_fp.h \
-	tpm2/crypto/CryptHash_fp.h \
-	tpm2/crypto/CryptHash.h \
-	tpm2/crypto/CryptPrime_fp.h \
-	tpm2/crypto/CryptPrimeSieve_fp.h \
-	tpm2/crypto/CryptRand_fp.h \
-	tpm2/crypto/CryptRand.h \
-	tpm2/crypto/CryptRsa_fp.h \
-	tpm2/crypto/CryptRsa.h \
-	tpm2/crypto/CryptSelfTest_fp.h \
-	tpm2/crypto/CryptSmac_fp.h \
-	tpm2/crypto/CryptSym.h \
-	tpm2/crypto/CryptSym_fp.h \
-	tpm2/crypto/CryptTest.h \
-	tpm2/crypto/CryptUtil_fp.h \
-	tpm2/crypto/ECC_Decrypt_fp.h \
-	tpm2/crypto/ECC_Encrypt_fp.h \
-	tpm2/ACT.h \
-	tpm2/ACT_spt_fp.h \
-	tpm2/ACT_SetTimeout_fp.h \
-	tpm2/ActivateCredential_fp.h \
-	tpm2/AlgorithmCap_fp.h \
-	tpm2/AlgorithmTests_fp.h \
-	tpm2/Attest_spt_fp.h \
-	tpm2/BaseTypes.h \
-	tpm2/Bits_fp.h \
-	tpm2/BnEccConstants.c \
-	tpm2/BnSupport_Interface.h \
-	tpm2/BnUtil_fp.h \
-	tpm2/Capabilities.h \
-	tpm2/CertifyCreation_fp.h \
-	tpm2/CertifyX509_fp.h \
-	tpm2/Certify_fp.h \
-	tpm2/ChangeEPS_fp.h \
-	tpm2/ChangePPS_fp.h \
-	tpm2/ClearControl_fp.h \
-	tpm2/Clear_fp.h \
-	tpm2/ClockRateAdjust_fp.h \
-	tpm2/ClockSet_fp.h \
-	tpm2/CommandAttributeData.h \
-	tpm2/CommandAttributes.h \
-	tpm2/CommandAudit_fp.h \
-	tpm2/CommandCodeAttributes_fp.h \
-	tpm2/CommandDispatchData.h \
-	tpm2/CommandDispatcher_fp.h \
-	tpm2/Commit_fp.h \
-	tpm2/CompilerDependencies.h \
-	tpm2/CompilerDependencies_gcc.h \
-	tpm2/CompilerDependencies_msvc.h \
-	tpm2/ContextLoad_fp.h \
-	tpm2/ContextSave_fp.h \
-	tpm2/Context_spt_fp.h \
-	tpm2/Create_fp.h \
-	tpm2/CreateLoaded_fp.h \
-	tpm2/CreatePrimary_fp.h \
-	tpm2/CryptoInterface.h \
-	tpm2/CryptSelfTest_fp.h \
-	tpm2/DA_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CryptCmac_fp.h \
+	tpm2/CryptDes_fp.h \
 	tpm2/DebugHelpers_fp.h \
-	tpm2/DictionaryAttackLockReset_fp.h \
-	tpm2/DictionaryAttackParameters_fp.h \
-	tpm2/Duplicate_fp.h \
-	tpm2/EccConstantData.inl \
-	tpm2/EccTestData.h \
-	tpm2/ECC_Parameters_fp.h \
-	tpm2/ECDH_KeyGen_fp.h \
-	tpm2/ECDH_ZGen_fp.h \
-	tpm2/EC_Ephemeral_fp.h \
-	tpm2/EncryptDecrypt2_fp.h \
-	tpm2/EncryptDecrypt_fp.h \
-	tpm2/EncryptDecrypt_spt_fp.h \
-	tpm2/endian_swap.h \
-	tpm2/Entity_fp.h \
-	tpm2/EventSequenceComplete_fp.h \
-	tpm2/EvictControl_fp.h \
-	tpm2/ExecCommand_fp.h \
-	tpm2/FlushContext_fp.h \
-	tpm2/GetCapability_fp.h \
-	tpm2/GetCommandAuditDigest_fp.h \
-	tpm2/GetRandom_fp.h \
-	tpm2/GetSessionAuditDigest_fp.h \
-	tpm2/GetTestResult_fp.h \
-	tpm2/GetTime_fp.h \
-	tpm2/Global.h \
-	tpm2/GpMacros.h \
-	tpm2/Handle_fp.h \
-	tpm2/Hash_fp.h \
-	tpm2/HashSequenceStart_fp.h \
-	tpm2/HashTestData.h \
-	tpm2/HierarchyChangeAuth_fp.h \
-	tpm2/HierarchyControl_fp.h \
-	tpm2/Hierarchy_fp.h \
-	tpm2/HMAC_fp.h \
-	tpm2/HMAC_Start_fp.h \
-	tpm2/Import_fp.h \
-	tpm2/IncrementalSelfTest_fp.h \
-	tpm2/InternalRoutines.h \
-	tpm2/IoBuffers_fp.h \
-	tpm2/KdfTestData.h \
-	tpm2/LoadExternal_fp.h \
-	tpm2/Load_fp.h \
-	tpm2/Locality_fp.h \
-	tpm2/MAC_fp.h \
-	tpm2/MAC_Start_fp.h \
-	tpm2/MakeCredential_fp.h \
-	tpm2/Manufacture_fp.h \
-	tpm2/Marshal.h \
-	tpm2/Marshal_fp.h \
-	tpm2/MathLibraryInterface.h \
-	tpm2/MathLibraryInterfaceTypes.h \
-	tpm2/MathOnByteBuffers_fp.h \
-	tpm2/Memory_fp.h \
-	tpm2/MinMax.h \
-	tpm2/NV_Certify_fp.h \
-	tpm2/NV_ChangeAuth_fp.h \
-	tpm2/NV_DefineSpace_fp.h \
-	tpm2/NV_DefineSpace2_fp.h \
-	tpm2/NvDynamic_fp.h \
-	tpm2/NV_Extend_fp.h \
-	tpm2/NV_GlobalWriteLock_fp.h \
-	tpm2/NV.h \
-	tpm2/NV_Increment_fp.h \
-	tpm2/NV_Read_fp.h \
-	tpm2/NV_ReadLock_fp.h \
-	tpm2/NV_ReadPublic_fp.h \
-	tpm2/NV_ReadPublic2_fp.h \
-	tpm2/NvReserved_fp.h \
-	tpm2/NV_SetBits_fp.h \
-	tpm2/NV_spt_fp.h \
-	tpm2/NV_UndefineSpace_fp.h \
-	tpm2/NV_UndefineSpaceSpecial_fp.h \
-	tpm2/NV_Write_fp.h \
-	tpm2/NV_WriteLock_fp.h \
-	tpm2/OIDs.h \
-	tpm2/ObjectChangeAuth_fp.h \
-	tpm2/Object_fp.h \
-	tpm2/Object_spt_fp.h \
-	tpm2/pcrstruct.h \
-	tpm2/PCR_Allocate_fp.h \
-	tpm2/PCR_Event_fp.h \
-	tpm2/PCR_Extend_fp.h \
-	tpm2/PCR_fp.h \
-	tpm2/PCR_Read_fp.h \
-	tpm2/PCR_Reset_fp.h \
-	tpm2/PCR_SetAuthPolicy_fp.h \
-	tpm2/PCR_SetAuthValue_fp.h \
-	tpm2/Platform.h \
-	tpm2/PlatformACT.h \
 	tpm2/PlatformACT_fp.h \
-	tpm2/PlatformClock.h \
-	tpm2/PlatformData.h \
-	tpm2/PlatformInternal.h \
-	tpm2/platform_failure_mode_fp.h \
-	tpm2/platform_init_fp.h \
-	tpm2/platform_virtual_nv_fp.h \
-	tpm2/platform_public_interface.h \
-	tpm2/platform_pcr_fp.h \
-	tpm2/platform_to_tpm_interface.h \
 	tpm2/Platform_fp.h \
-	tpm2/PolicyAuthorize_fp.h \
-	tpm2/PolicyAuthorizeNV_fp.h \
-	tpm2/PolicyAuthValue_fp.h \
-	tpm2/PolicyCapability_fp.h \
-	tpm2/PolicyCommandCode_fp.h \
-	tpm2/PolicyCounterTimer_fp.h \
-	tpm2/PolicyCpHash_fp.h \
-	tpm2/PolicyDuplicationSelect_fp.h \
-	tpm2/PolicyGetDigest_fp.h \
-	tpm2/PolicyLocality_fp.h \
-	tpm2/PolicyNameHash_fp.h \
-	tpm2/PolicyNV_fp.h \
-	tpm2/PolicyNvWritten_fp.h \
-	tpm2/PolicyOR_fp.h \
-	tpm2/PolicyParameters_fp.h \
-	tpm2/PolicyPassword_fp.h \
-	tpm2/PolicyPCR_fp.h \
-	tpm2/PolicyPhysicalPresence_fp.h \
-	tpm2/PolicyRestart_fp.h \
-	tpm2/PolicySecret_fp.h \
-	tpm2/PolicySigned_fp.h \
-	tpm2/Policy_spt_fp.h \
-	tpm2/PolicyTemplate_fp.h \
-	tpm2/PolicyTicket_fp.h \
-	tpm2/PolicyTransportSPDM_fp.h \
-	tpm2/Power_fp.h \
-	tpm2/PP_Commands_fp.h \
-	tpm2/PP_fp.h \
-	tpm2/PRNG_TestVectors.h \
-	tpm2/PropertyCap_fp.h \
-	tpm2/Quote_fp.h \
-	tpm2/ReadClock_fp.h \
-	tpm2/ReadOnlyControl_fp.h \
-	tpm2/ReadPublic_fp.h \
-	tpm2/ResponseCodeProcessing_fp.h \
-	tpm2/Response_fp.h \
-	tpm2/Rewrap_fp.h \
-	tpm2/RsaTestData.h \
-	tpm2/RSA_Decrypt_fp.h \
-	tpm2/RSA_Encrypt_fp.h \
-	tpm2/SecChannel_fp.h \
-	tpm2/SelfTest.h \
-	tpm2/SelfTest_fp.h \
-	tpm2/SequenceComplete_fp.h \
-	tpm2/SequenceUpdate_fp.h \
-	tpm2/Session_fp.h \
-	tpm2/SessionProcess_fp.h \
-	tpm2/SetAlgorithmSet_fp.h \
-	tpm2/SetCapability_fp.h \
-	tpm2/SetCommandCodeAuditStatus_fp.h \
-	tpm2/SetPrimaryPolicy_fp.h \
-	tpm2/Shutdown_fp.h \
-	tpm2/Sign_fp.h \
-	tpm2/simulatorPrivate.h \
-	tpm2/simulator_sysheaders.h \
-	tpm2/Simulator_fp.h \
-	tpm2/StartAuthSession_fp.h \
-	tpm2/Startup_fp.h \
-	tpm2/StirRandom_fp.h \
-	tpm2/SymmetricTest.h \
-	tpm2/SymmetricTestData.h \
 	tpm2/TcpServerPosix_fp.h \
-	tpm2/TestParms_fp.h \
-	tpm2/Ticket_fp.h \
-	tpm2/Time_fp.h \
-	tpm2/TPMB.h \
-	tpm2/TpmAlgorithmDefines.h \
-	tpm2/TpmASN1.h \
-	tpm2/TpmASN1_fp.h \
-	tpm2/TpmBuildSwitches.h \
-	tpm2/TpmEcc_Signature_ECDAA_fp.h \
-	tpm2/TpmEcc_Signature_ECDSA_fp.h \
-	tpm2/TpmEcc_Signature_Schnorr_fp.h \
-	tpm2/TpmEcc_Signature_SM2_fp.h \
-	tpm2/TpmEcc_Signature_Util_fp.h \
-	tpm2/TpmFail_fp.h \
-	tpm2/TpmMath_Debug_fp.h \
-	tpm2/TpmMath_Util_fp.h \
-	tpm2/TpmProfile.h \
-	tpm2/TpmProfile_CommandList.h \
-	tpm2/TpmProfile_Common.h \
-	tpm2/TpmProfile_ErrorCodes.h \
-	tpm2/TpmProfile_Misc.h \
-	tpm2/Tpm.h \
-	tpm2/TpmBigNum.h \
-	tpm2/tpm_debug.h \
-	tpm2/tpm_public.h \
-	tpm2/tpm_to_platform_interface.h \
-	tpm2/_TPM_Hash_Data_fp.h \
-	tpm2/_TPM_Hash_End_fp.h \
-	tpm2/_TPM_Hash_Start_fp.h \
-	tpm2/_TPM_Init_fp.h \
-	tpm2/TpmCalculatedAttributes.h \
-	tpm2/TpmEcc_Util_fp.h \
-	tpm2/TpmSizeChecks_fp.h \
-	tpm2/TpmTcpProtocol.h \
-	tpm2/TpmTypes.h \
+	tpm2/TPMCmd/Platform/include/PlatformACT.h \
+	tpm2/TPMCmd/Platform/include/PlatformClock.h \
+	tpm2/TPMCmd/Platform/include/PlatformData.h \
+	tpm2/TPMCmd/Platform/include/Platform.h \
+	tpm2/TPMCmd/Platform/include/PlatformInternal.h \
+	tpm2/TPMCmd/Platform/include/prototypes/platform_public_interface.h \
+	tpm2/TPMCmd/Simulator/include/prototypes/Simulator_fp.h \
+	tpm2/TPMCmd/Simulator/include/TpmTcpProtocol.h \
+	tpm2/TPMCmd/Simulator/src/simulatorPrivate.h \
+	tpm2/TPMCmd/Simulator/src/simulator_sysheaders.h \
+	tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmBuildSwitches.h \
+	tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_CommandList.h \
+	tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_Common.h \
+	tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_ErrorCodes.h \
+	tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile.h \
+	tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_Misc.h \
+	tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandAttributeData_s_ccAttr.inl \
+	tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandAttributeData_s_commandAttributes.inl \
+	tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandDispatchData_CommandStructures.inl \
+	tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandDispatchData_s_CommandDataArray.inl \
+	tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/prototypes/Vendor_TCG_Test_fp.h \
+	tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/VendorCommandList.h \
+	tpm2/TPMCmd/tpm/cryptolibs/common/include/CryptoInterface.h \
+	tpm2/TPMCmd/tpm/cryptolibs/common/include/EccConstantData.inl \
+	tpm2/TPMCmd/tpm/cryptolibs/common/include/MathLibraryInterface.h \
+	tpm2/TPMCmd/tpm/cryptolibs/common/include/MathLibraryInterfaceTypes.h \
+	tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnEccConstants.c \
+	tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnSupport_Interface.h \
+	tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnUtil_fp.h \
+	tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/TpmBigNum.h \
+	tpm2/TPMCmd/tpm/include/platform_interface/pcrstruct.h \
+	tpm2/TPMCmd/tpm/include/platform_interface/platform_to_tpm_interface.h \
+	tpm2/TPMCmd/tpm/include/platform_interface/prototypes/ExecCommand_fp.h \
+	tpm2/TPMCmd/tpm/include/platform_interface/prototypes/Manufacture_fp.h \
+	tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_failure_mode_fp.h \
+	tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_init_fp.h \
+	tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_pcr_fp.h \
+	tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_virtual_nv_fp.h \
+	tpm2/TPMCmd/tpm/include/platform_interface/prototypes/_TPM_Hash_Data_fp.h \
+	tpm2/TPMCmd/tpm/include/platform_interface/prototypes/_TPM_Hash_End_fp.h \
+	tpm2/TPMCmd/tpm/include/platform_interface/prototypes/_TPM_Hash_Start_fp.h \
+	tpm2/TPMCmd/tpm/include/platform_interface/prototypes/_TPM_Init_fp.h \
+	tpm2/TPMCmd/tpm/include/platform_interface/tpm_to_platform_interface.h \
+	tpm2/TPMCmd/tpm/include/private/CommandAttributeData.h \
+	tpm2/TPMCmd/tpm/include/private/CommandAttributes.h \
+	tpm2/TPMCmd/tpm/include/private/CommandDispatchData.h \
+	tpm2/TPMCmd/tpm/include/private/CryptEcc.h \
+	tpm2/TPMCmd/tpm/include/private/CryptHash.h \
+	tpm2/TPMCmd/tpm/include/private/CryptRand.h \
+	tpm2/TPMCmd/tpm/include/private/CryptRsa.h \
+	tpm2/TPMCmd/tpm/include/private/CryptSym.h \
+	tpm2/TPMCmd/tpm/include/private/CryptTest.h \
+	tpm2/TPMCmd/tpm/include/private/EccTestData.h \
+	tpm2/TPMCmd/tpm/include/private/Global.h \
+	tpm2/TPMCmd/tpm/include/private/HashTestData.h \
+	tpm2/TPMCmd/tpm/include/private/InternalRoutines.h \
+	tpm2/TPMCmd/tpm/include/private/KdfTestData.h \
+	tpm2/TPMCmd/tpm/include/private/Marshal.h \
+	tpm2/TPMCmd/tpm/include/private/NV.h \
+	tpm2/TPMCmd/tpm/include/private/OIDs.h \
+	tpm2/TPMCmd/tpm/include/private/PRNG_TestVectors.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ActivateCredential_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ACT_SetTimeout_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ACT_spt_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/AlgorithmCap_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/AlgorithmTests_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Attest_spt_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Bits_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CertifyCreation_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Certify_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CertifyX509_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ChangeEPS_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ChangePPS_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ClearControl_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Clear_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ClockRateAdjust_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ClockSet_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CommandAudit_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CommandCodeAttributes_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CommandDispatcher_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Commit_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ContextLoad_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ContextSave_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Context_spt_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Create_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CreateLoaded_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CreatePrimary_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccCrypt_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccKeyExchange_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccMain_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CryptEccSignature_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CryptHash_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CryptPrime_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CryptPrimeSieve_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CryptRand_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CryptRsa_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CryptSelfTest_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CryptSmac_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CryptSym_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/CryptUtil_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/DA_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/DictionaryAttackLockReset_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/DictionaryAttackParameters_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ECC_Decrypt_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ECC_Encrypt_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Duplicate_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ECC_Parameters_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ECDH_KeyGen_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ECDH_ZGen_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/EC_Ephemeral_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/EncryptDecrypt2_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/EncryptDecrypt_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/EncryptDecrypt_spt_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Entity_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/EventSequenceComplete_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/EvictControl_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/FlushContext_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/GetCapability_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/GetCommandAuditDigest_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/GetRandom_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/GetSessionAuditDigest_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/GetTestResult_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/GetTime_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Handle_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Hash_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/HashSequenceStart_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/HierarchyChangeAuth_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/HierarchyControl_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Hierarchy_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/HMAC_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/HMAC_Start_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Import_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/IncrementalSelfTest_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/IoBuffers_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/LoadExternal_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Load_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Locality_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/MAC_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/MAC_Start_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/MakeCredential_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Marshal_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/MathOnByteBuffers_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Memory_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_Certify_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_ChangeAuth_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_DefineSpace2_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_DefineSpace_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NvDynamic_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_Extend_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_GlobalWriteLock_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_Increment_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_Read_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_ReadLock_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_ReadPublic2_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_ReadPublic_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NvReserved_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_SetBits_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_spt_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_UndefineSpace_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_UndefineSpaceSpecial_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_Write_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/NV_WriteLock_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ObjectChangeAuth_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Object_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Object_spt_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Allocate_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Event_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Extend_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PCR_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Read_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PCR_Reset_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PCR_SetAuthPolicy_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PCR_SetAuthValue_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyAuthorize_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyAuthorizeNV_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyAuthValue_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyCapability_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyCommandCode_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyCounterTimer_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyCpHash_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyDuplicationSelect_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyGetDigest_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyLocality_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyNameHash_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyNV_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyNvWritten_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyOR_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyParameters_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyPassword_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyPCR_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyPhysicalPresence_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyRestart_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicySecret_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicySigned_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Policy_spt_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyTemplate_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyTicket_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PolicyTransportSPDM_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Power_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PP_Commands_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PP_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/PropertyCap_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Quote_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ReadClock_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ReadOnlyControl_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ReadPublic_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ResponseCodeProcessing_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Response_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Rewrap_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/RSA_Decrypt_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/RSA_Encrypt_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/SecChannel_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/SelfTest_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/SequenceComplete_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/SequenceUpdate_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Session_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/SessionProcess_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/SetAlgorithmSet_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/SetCapability_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/SetCommandCodeAuditStatus_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/SetPrimaryPolicy_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Shutdown_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Sign_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/StartAuthSession_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Startup_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/StirRandom_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/TestParms_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Ticket_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Time_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/TpmASN1_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_ECDAA_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_ECDSA_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_Schnorr_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_SM2_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Signature_Util_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/TpmEcc_Util_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/TpmMath_Debug_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/TpmMath_Util_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/TpmSizeChecks_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/Unseal_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/VerifySignature_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/X509_ECC_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/X509_RSA_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/X509_spt_fp.h \
+	tpm2/TPMCmd/tpm/include/private/prototypes/ZGen_2Phase_fp.h \
+	tpm2/TPMCmd/tpm/include/private/RsaTestData.h \
+	tpm2/TPMCmd/tpm/include/private/SelfTest.h \
+	tpm2/TPMCmd/tpm/include/private/SymmetricTestData.h \
+	tpm2/TPMCmd/tpm/include/private/SymmetricTest.h \
+	tpm2/TPMCmd/tpm/include/private/TpmASN1.h \
+	tpm2/TPMCmd/tpm/include/private/Tpm.h \
+	tpm2/TPMCmd/tpm/include/private/X509.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/ACT.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/BaseTypes.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/Capabilities.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/CompilerDependencies_gcc.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/CompilerDependencies.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/CompilerDependencies_msvc.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/endian_swap.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/GpMacros.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/MinMax.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/prototypes/TpmFail_fp.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/TpmAlgorithmDefines.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/TPMB.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/TpmCalculatedAttributes.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/tpm_debug.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/tpm_public.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/TpmTypes.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/VerifyConfiguration.h \
 	tpm2/Unmarshal_fp.h \
-	tpm2/Unseal_fp.h \
-	tpm2/VerifyConfiguration.h \
-	tpm2/VerifySignature_fp.h \
-	tpm2/X509.h \
-	tpm2/X509_ECC_fp.h \
-	tpm2/X509_RSA_fp.h \
-	tpm2/X509_spt_fp.h \
-	tpm2/ZGen_2Phase_fp.h \
-	tpm2/VendorCommands/CommandAttributeData_s_ccAttr.inl \
-	tpm2/VendorCommands/CommandAttributeData_s_commandAttributes.inl \
-	tpm2/VendorCommands/CommandDispatchData_CommandStructures.inl \
-	tpm2/VendorCommands/CommandDispatchData_s_CommandDataArray.inl \
-	tpm2/VendorCommands/Vendor_TCG_Test_fp.h \
-	tpm2/VendorCommands/VendorCommandList.h \
 	\
 	tpm2/BackwardsCompatibility.h \
 	tpm2/BackwardsCompatibilityBitArray.h \
@@ -624,49 +624,60 @@ noinst_HEADERS += \
 if LIBTPMS_USE_OPENSSL
 
 libtpms_tpm2_la_SOURCES += \
-	tpm2/crypto/openssl/BnToOsslMath.c \
-	tpm2/crypto/openssl/CryptCmac.c \
-	tpm2/crypto/openssl/CryptDes.c \
-	tpm2/crypto/openssl/CryptEccCrypt.c \
-	tpm2/crypto/openssl/CryptEccKeyExchange.c \
-	tpm2/crypto/openssl/CryptEccMain.c \
-	tpm2/crypto/openssl/CryptEccSignature.c \
-	tpm2/crypto/openssl/CryptHash.c \
-	tpm2/crypto/openssl/CryptPrime.c \
-	tpm2/crypto/openssl/CryptPrimeSieve.c \
-	tpm2/crypto/openssl/CryptRand.c \
-	tpm2/crypto/openssl/CryptRsa.c \
-	tpm2/crypto/openssl/CryptSmac.c \
-	tpm2/crypto/openssl/CryptSym.c \
-	tpm2/crypto/openssl/ExpDCache.c \
-	tpm2/crypto/openssl/Helpers.c \
-	tpm2/crypto/openssl/TpmToOsslDesSupport.c \
-	tpm2/crypto/openssl/TpmToOsslSupport.c
+	tpm2/TPMCmd/tpm/cryptolibs/Ossl/BnToOsslMath.c \
+	tpm2/TPMCmd/tpm/src/crypt/CryptCmac.c \
+	tpm2/TPMCmd/tpm/src/crypt/CryptDes.c \
+	tpm2/TPMCmd/tpm/src/crypt/CryptEccCrypt.c \
+	tpm2/TPMCmd/tpm/src/crypt/CryptEccKeyExchange.c \
+	tpm2/TPMCmd/tpm/src/crypt/CryptEccMain.c \
+	tpm2/TPMCmd/tpm/src/crypt/CryptEccSignature.c \
+	tpm2/TPMCmd/tpm/src/crypt/CryptHash.c \
+	tpm2/TPMCmd/tpm/src/crypt/CryptPrime.c \
+	tpm2/TPMCmd/tpm/src/crypt/CryptPrimeSieve.c \
+	tpm2/TPMCmd/tpm/src/crypt/CryptRand.c \
+	tpm2/TPMCmd/tpm/src/crypt/CryptRsa.c \
+	tpm2/TPMCmd/tpm/src/crypt/CryptSmac.c \
+	tpm2/TPMCmd/tpm/src/crypt/CryptSym.c \
+	tpm2/TPMCmd/tpm/cryptolibs/Ossl/ExpDCache.c \
+	tpm2/TPMCmd/tpm/cryptolibs/Ossl/Helpers.c \
+	tpm2/TPMCmd/tpm/cryptolibs/Ossl/TpmToOsslDesSupport.c \
+	tpm2/TPMCmd/tpm/cryptolibs/Ossl/TpmToOsslSupport.c
 
 noinst_HEADERS += \
-	tpm2/crypto/openssl/BnOssl.h \
-	tpm2/crypto/openssl/BnToOsslMath_fp.h \
-	tpm2/crypto/openssl/BnToOsslMath.h \
-	tpm2/crypto/openssl/ConsttimeUtils.h \
-	tpm2/crypto/openssl/BnConvert_fp.h \
-	tpm2/crypto/openssl/BnMath_fp.h \
-	tpm2/crypto/openssl/BnMemory_fp.h \
-	tpm2/crypto/openssl/BnValues.h \
-	tpm2/crypto/openssl/ExpDCache_fp.h \
-	tpm2/crypto/openssl/Helpers_fp.h \
-	tpm2/crypto/openssl/LibSupport.h \
-	tpm2/crypto/openssl/TpmToTpmBigNumMath.h \
-	tpm2/crypto/openssl/TpmToOsslDesSupport_fp.h \
-	tpm2/crypto/openssl/TpmToOsslHash.h \
-	tpm2/crypto/openssl/TpmToOsslSupport_fp.h \
-	tpm2/crypto/openssl/TpmToOsslSym.h \
-	tpm2/crypto/openssl/tpm_radix.h
+	tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/BnOssl.h \
+	tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/BnToOsslMath_fp.h \
+	tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnConvert_fp.h \
+	tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnMath_fp.h \
+	tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnMemory_fp.h \
+	tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnValues.h \
+	tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/BnToOsslMath.h \
+	tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/ExpDCache_fp.h \
+	tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/Helpers_fp.h \
+	tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/TpmToOsslDesSupport_fp.h \
+	tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/TpmToOsslHash.h \
+	tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/TpmToOsslSupport_fp.h \
+	tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/TpmToOsslSym.h \
+	tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/TpmBigNum/TpmToTpmBigNumMath.h \
+	tpm2/TPMCmd/tpm/include/private/LibSupport.h \
+	tpm2/TPMCmd/tpm/include/tpm_public/tpm_radix.h
 
 libtpms_tpm2_la_CFLAGS += \
 	-I $(srcdir)/tpm2 \
-	-I $(srcdir)/tpm2/crypto \
-	-I $(srcdir)/tpm2/crypto/openssl
-
+	-I $(srcdir)/tpm2/crypto/openssl \
+	-I $(srcdir)/tpm2/TPMCmd/Platform/include/ \
+	-I $(srcdir)/tpm2/TPMCmd/Simulator/include/ \
+	-I $(srcdir)/tpm2/TPMCmd/Simulator/include/prototypes \
+	-I $(srcdir)/tpm2/TPMCmd/TpmConfiguration \
+	-I $(srcdir)/tpm2/TPMCmd/tpm/include/ \
+	-I $(srcdir)/tpm2/TPMCmd/tpm/include/private \
+	-I $(srcdir)/tpm2/TPMCmd/tpm/include/private/prototypes/ \
+	-I $(srcdir)/tpm2/TPMCmd/tpm/cryptolibs/common/include/ \
+	-I $(srcdir)/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/ \
+	-I $(srcdir)/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/TpmBigNum/ \
+	-I $(srcdir)/tpm2/TPMCmd/tpm/cryptolibs/ \
+	-I $(srcdir)/tpm2/TPMCmd/tpm/cryptolibs/Ossl/ \
+	-I $(srcdir)/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include \
+	-I $(srcdir)/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/
 
 libtpms_tpm2_la_LIBADD += -lcrypto
 

src/tpm2/BackwardsCompatibilityBitArray.h

@@ -40,7 +40,7 @@
 #define BACKWARDS_COMPATIBILITY_BIT_ARRAY_H
 
 #include "Tpm.h"
-#include "TpmTypes.h"
+#include <tpm_public/TpmTypes.h>
 
 TPM_RC
 ConvertFromCompressedBitArray(BYTE         *inAuditCommands,

src/tpm2/NVMarshal.c

@@ -56,7 +56,7 @@
 #include "Simulator_fp.h"
 #include "BackwardsCompatibilityBitArray.h"
 #include "BackwardsCompatibilityObject.h"
-#include "platform_failure_mode_fp.h"
+#include <platform_interface/prototypes/platform_failure_mode_fp.h>
 
 #define TPM_HAVE_TPM2_DECLARATIONS
 #include "tpm_library_intern.h"

src/tpm2/NVMarshal.h

@@ -42,7 +42,7 @@
 #include <stdbool.h>
 
 #include "Tpm.h"
-#include "TpmTypes.h"
+#include "tpm_public/TpmTypes.h"
 #include "RuntimeProfile_fp.h"
 
 #define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))

src/tpm2/Platform.h

@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-
-
-#ifndef _PLATFORM_H_
-#define _PLATFORM_H_
-
-#include "TpmBuildSwitches.h"
-#include "TpmProfile.h"
-#include "BaseTypes.h"
-#include "TPMB.h"
-#include "MinMax.h"
-
-#include "PlatformACT.h"
-#include "PlatformClock.h"
-#include "PlatformData.h"
-#include "platform_public_interface.h"
-#include "tpm_to_platform_interface.h"
-#include "platform_to_tpm_interface.h"
-#include "PlatformInternal.h"
-
-#define GLOBAL_C
-#define NV_C
-#include "pcrstruct.h"
-#include "platform_pcr_fp.h"
-
-#endif  // _PLATFORM_H_

src/tpm2/Platform_fp.h

@@ -58,4 +58,5 @@
 /*										*/
 /********************************************************************************/
 
-#include "platform_public_interface.h"		// libtpms added
+#include <prototypes/platform_public_interface.h>	// libtpms added
+

src/tpm2/RuntimeAlgorithm.c

@@ -45,7 +45,7 @@
 
 #include "Tpm.h"
 #include "NVMarshal.h"
-#include "GpMacros.h"
+#include "tpm_public/GpMacros.h"
 #include "tpm_library_intern.h"
 
 #define ALGO_SEPARATOR_C ','

src/tpm2/StateMarshal.h

@@ -40,7 +40,7 @@
 #define STATE_MARSHAL_H
 
 #include "Tpm.h"
-#include "TpmTypes.h"
+#include <tpm_public/TpmTypes.h>
 
 /*
  * we keep these in a separate file to avoid symbol clashes when

src/tpm2/TPMCmd/Platform/include/Platform.h

@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: BSD-2-Clause
+
+
+#ifndef _PLATFORM_H_
+#define _PLATFORM_H_
+
+#include <TpmConfiguration/TpmBuildSwitches.h>
+#include <TpmConfiguration/TpmProfile.h>
+// TODO_RENAME_INC_FOLDER: public refers to the TPM_CoreLib public headers
+#include <tpm_public/BaseTypes.h>
+#include <tpm_public/TPMB.h>
+#include <tpm_public/MinMax.h>
+
+#include "PlatformACT.h"
+#include "PlatformClock.h"
+#include "PlatformData.h"
+#include "prototypes/platform_public_interface.h"
+// TODO_RENAME_INC_FOLDER:platform_interface refers to the TPM_CoreLib platform interface
+#include <platform_interface/tpm_to_platform_interface.h>
+#include <platform_interface/platform_to_tpm_interface.h>
+#include "PlatformInternal.h"
+
+#define GLOBAL_C
+#define NV_C
+#include <platform_interface/pcrstruct.h>
+#include <platform_interface/prototypes/platform_pcr_fp.h>
+
+#endif  // _PLATFORM_H_

src/tpm2/TPMCmd/Platform/src/NVVirtual.c

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: BSD-2-Clause
 
 #include "Platform.h"
-#include "TpmAlgorithmDefines.h"
-#include "TpmTypes.h"
-#include "platform_virtual_nv_fp.h"
+#include <tpm_public/TpmAlgorithmDefines.h>
+#include <tpm_public/TpmTypes.h>
+#include <platform_interface/prototypes/platform_virtual_nv_fp.h>
 
 // NV Index handles for EKICA and EK Certificates.
 #define RSA_2048_EK_CERT_HANDLE (0x01c00002)

src/tpm2/TPMCmd/Platform/src/PlatformPcr.c

@@ -3,7 +3,7 @@
 
 // PCR platform interface functions
 #include "Platform.h"
-#include "TpmAlgorithmDefines.h"
+#include <tpm_public/TpmAlgorithmDefines.h>
 
 // use this as a convenient lookup for hash size for PCRs.
 UINT16 CryptHashGetDigestSize(TPM_ALG_ID hashAlg  // IN: hash algorithm to look up

src/tpm2/TPMCmd/Platform/src/SelfTest.c

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: BSD-2-Clause
 
 #include "Platform.h"
-#include "TpmAlgorithmDefines.h"
-#include "TpmTypes.h"
+#include <tpm_public/TpmAlgorithmDefines.h>
+#include <tpm_public/TpmTypes.h>
 
 LIB_EXPORT void _plat_GetEnabledSelfTest(
     uint8_t  fullTest,         // IN: full test or not

src/tpm2/TPMCmd/Simulator/src/simulatorPrivate.h

@@ -8,27 +8,24 @@
 /*										*/
 /*  1. Copyright Licenses:							*/
 /*										*/
-/*  - Trusted Computing Group (TCG) grants to the user of the source code in	*/
-/*    this specification (the "Source Code") a worldwide, irrevocable, 		*/
-/*    nonexclusive, royalty free, copyright license to reproduce, create 	*/
-/*    derivative works, distribute, display and perform the Source Code and	*/
-/*    derivative works thereof, and to grant others the rights granted herein.	*/
+/*  (c) Copyright IBM Corporation, 2020-2025					*/
 /*										*/
-/*  - The TCG grants to the user of the other parts of the specification 	*/
-/*    (other than the Source Code) the rights to reproduce, distribute, 	*/
-/*    display, and perform the specification solely for the purpose of 		*/
-/*    developing products based on such documents.				*/
+/* All rights reserved.								*/
 /*										*/
-/*  2. Source Code Distribution Conditions:					*/
+/* Redistribution and use in source and binary forms, with or without		*/
+/* modification, are permitted provided that the following conditions are	*/
+/* met:										*/
 /*										*/
-/*  - Redistributions of Source Code must retain the above copyright licenses, 	*/
-/*    this list of conditions and the following disclaimers.			*/
+/* Redistributions of source code must retain the above copyright notice,	*/
+/* this list of conditions and the following disclaimer.			*/
 /*										*/
-/*  - Redistributions in binary form must reproduce the above copyright 	*/
-/*    licenses, this list of conditions	and the following disclaimers in the 	*/
-/*    documentation and/or other materials provided with the distribution.	*/
+/* Redistributions in binary form must reproduce the above copyright		*/
+/* notice, this list of conditions and the following disclaimer in the		*/
+/* documentation and/or other materials provided with the distribution.		*/
 /*										*/
-/*  3. Disclaimers:								*/
+/* Neither the names of the IBM Corporation nor the names of its		*/
+/* contributors may be used to endorse or promote products derived from		*/
+/* this software without specific prior written permission.			*/
 /*										*/
 /*  - THE COPYRIGHT LICENSES SET FORTH ABOVE DO NOT REPRESENT ANY FORM OF	*/
 /*  LICENSE OR WAIVER, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, WITH	*/
@@ -65,15 +62,15 @@
 #define SIMULATOR_PRIVATE_H
 
 //** Includes, Locals, Defines and Function Prototypes
-#include "tpm_public.h"
+#include <tpm_public/tpm_public.h>
 
 #include "simulator_sysheaders.h"
 
 // TODO_RENAME_INC_FOLDER:prototypes refers to the platform library
-#include "platform_public_interface.h"
+#include <prototypes/platform_public_interface.h>
 // TODO_RENAME_INC_FOLDER:platform_interface refers to the TPM_CoreLib platform interface
-#include "tpm_to_platform_interface.h"
-#include "platform_to_tpm_interface.h"
+#include <platform_interface/tpm_to_platform_interface.h>
+#include <platform_interface/platform_to_tpm_interface.h>
 
 #include "TpmTcpProtocol.h"
 #include "Simulator_fp.h"

src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmBuildSwitches.h

@@ -200,6 +200,6 @@
 #define FAIL_TRACE                  YES
 
 // TODO_RENAME_INC_FOLDER: public refers to the TPM_CoreLib public headers
-#include "CompilerDependencies.h"
+#include <tpm_public/CompilerDependencies.h>
 
 #endif  // _TPM_BUILD_SWITCHES_H_

src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile.h

@@ -8,11 +8,11 @@
 #ifndef _TPM_PROFILE_H_
 #define _TPM_PROFILE_H_
 
-#include "TpmBuildSwitches.h"
-#include "TpmProfile_Common.h"
-#include "TpmProfile_CommandList.h"
-#include "TpmProfile_Misc.h"
-#include "TpmProfile_ErrorCodes.h"
+#include <TpmConfiguration/TpmBuildSwitches.h>
+#include <TpmConfiguration/TpmProfile_Common.h>
+#include <TpmConfiguration/TpmProfile_CommandList.h>
+#include <TpmConfiguration/TpmProfile_Misc.h>
+#include <TpmConfiguration/TpmProfile_ErrorCodes.h>
 
 //					libtpms: added begin
 #ifndef HASH_LIB

src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/TpmProfile_CommandList.h

@@ -170,6 +170,6 @@
 
 // clang-format on
 
-#include "VendorCommands/VendorCommandList.h"
+#include <TpmConfiguration/VendorCommands/VendorCommandList.h>
 
 #endif  // _TPM_PROFILE_COMMAND_LIST_H_

src/tpm2/TPMCmd/TpmConfiguration/TpmConfiguration/VendorCommands/CommandDispatchData_CommandStructures.inl

@@ -14,7 +14,7 @@
 #endif
 
 #if CC_Vendor_TCG_Test
-#  include "Vendor_TCG_Test_fp.h" // libtpms: changed
+#  include "TpmConfiguration/VendorCommands/prototypes/Vendor_TCG_Test_fp.h"
 
 typedef TPM_RC(Vendor_TCG_Test_Entry)(Vendor_TCG_Test_In*  in,
                                       Vendor_TCG_Test_Out* out);

src/tpm2/TPMCmd/TpmConfiguration/TpmVendorCommandHandlers/Vendor_TCG_Test.c

@@ -1,11 +1,10 @@
-// SPDX-License-Identifier: BSD-2-Clause
 
-#include "tpm_public.h"
+#include <tpm_public/tpm_public.h>
 
 #if CC_Vendor_TCG_Test  // Conditional expansion of this file
 
-#  include "TpmTypes.h"
-#  include "Vendor_TCG_Test_fp.h"
+#  include <tpm_public/TpmTypes.h>
+#  include <TpmConfiguration/VendorCommands/prototypes/Vendor_TCG_Test_fp.h>
 
 TPM_RC
 TPM2_Vendor_TCG_Test(Vendor_TCG_Test_In*  in,  // IN: input parameter list

src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/BnToOsslMath.c

@@ -26,7 +26,7 @@
 #include "BnOssl.h"
 
 #ifdef MATH_LIB_OSSL
-#  include "BnToOsslMath_fp.h"
+#  include <Ossl/BnToOsslMath_fp.h>
 
 //** Functions
 

src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/TpmToOsslSupport.c

@@ -66,9 +66,9 @@
 //** Defines and Includes
 
 #include "BnOssl.h"
-#include "CryptoInterface.h"
-#include "TpmToOsslSym.h"
-#include "TpmToOsslHash.h"
+#include <CryptoInterface.h>
+#include <Ossl/TpmToOsslSym.h>
+#include <Ossl/TpmToOsslHash.h>
 #include <openssl/opensslv.h>
 #include <stdio.h>
 

src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/BnOssl.h

@@ -64,15 +64,15 @@
 #ifndef _BNOSSL_H_
 #define _BNOSSL_H_
 // TODO_RENAME_INC_FOLDER: public refers to the TPM_CoreLib public headers
-#include "tpm_public.h"
-#include "TpmFail_fp.h"
-#include "BnToOsslMath.h"
+#include <tpm_public/tpm_public.h>
+#include <tpm_public/prototypes/TpmFail_fp.h>
+#include <Ossl/BnToOsslMath.h>
 // TODO_RENAME_INC_FOLDER: these refer to TpmBigNum protected headers
-#include "BnSupport_Interface.h"
-#include "BnUtil_fp.h"
-#include "BnMemory_fp.h"
-#include "BnMath_fp.h"
-#include "BnConvert_fp.h"
+#include <BnSupport_Interface.h>
+#include <BnUtil_fp.h>
+#include <BnMemory_fp.h>
+#include <BnMath_fp.h>
+#include <BnConvert_fp.h>
 
 #if CRYPTO_LIB_REPORTING
 #  include <CryptoInterface.h>

src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/BnToOsslMath.h

@@ -72,7 +72,7 @@
 #  error this OpenSSL Interface expects to be used from TpmBigNum
 #endif
 
-#include "BnValues.h"
+#include <BnValues.h>
 #include <openssl/evp.h>
 #include <openssl/ec.h>
 #include <openssl/bn.h>
@@ -149,7 +149,7 @@ TPM_INLINE const TPMBN_ECC_CURVE_CONSTANTS* AccessCurveConstants(
     return E->C;
 }
 
-#include "TpmToOsslSupport_fp.h"
+#include <Ossl/TpmToOsslSupport_fp.h>
 
 // Start and end a context within which the OpenSSL memory management works
 #define OSSL_ENTER() BN_CTX* CTX = OsslContextEnter()

src/tpm2/TPMCmd/tpm/cryptolibs/Ossl/include/Ossl/Helpers_fp.h

@@ -43,7 +43,7 @@
 #ifndef HELPERS_FP_H
 #define HELPERS_FP_H
 
-#include "TpmTypes.h"
+#include "tpm_public/TpmTypes.h"
 
 #include <openssl/evp.h>
 

src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/BnEccConstants.c

@@ -7,7 +7,7 @@
 #include "TpmBigNum.h"
 //#include "Tpm.h"
 // TODO_RENAME_INC_FOLDER:private refers to the TPM_CoreLib private headers
-#include "OIDs.h"
+#include <private/OIDs.h>
 
 #if ALG_ECC
 
@@ -46,7 +46,7 @@
 // This file contains the raw data for ECC curve constants. The data is wrapped
 // in macros so this file can be included in other files that format the data in
 // a memory format desired by the user.  This file itself is never used alone.
-#  include "EccConstantData.inl"
+#  include <EccConstantData.inl>
 
 // now define the TPMBN_ECC_CURVE_CONSTANTS objects for the known curves
 

src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/TpmBigNum.h

@@ -61,17 +61,17 @@
 //** Introduction
 // This file contains the headers necessary to build the tpm big num library.
 // TODO_RENAME_INC_FOLDER: public refers to the TPM_CoreLib public headers
-#include "tpm_public.h"
-#include "TpmFail_fp.h"
+#include <tpm_public/tpm_public.h>
+#include <tpm_public/prototypes/TpmFail_fp.h>
 // TODO_RENAME_INC_FOLDER: private refers to the TPM_CoreLib private(protected) headers
-#include "TpmAlgorithmDefines.h"
-#include "GpMacros.h"  // required for TpmFail_fp.h
-#include "Capabilities.h"
-#include "TpmTypes.h"  // requires capabilities & GpMacros
-#include "TpmToTpmBigNumMath.h"
+#include <tpm_public/TpmAlgorithmDefines.h>
+#include <tpm_public/GpMacros.h>  // required for TpmFail_fp.h
+#include <tpm_public/Capabilities.h>
+#include <tpm_public/TpmTypes.h>  // requires capabilities & GpMacros
+#include <TpmBigNum/TpmToTpmBigNumMath.h>
 #include "BnSupport_Interface.h"
 #include "BnConvert_fp.h"
 #include "BnMemory_fp.h"
 #include "BnMath_fp.h"
 #include "BnUtil_fp.h"
-#include "MathLibraryInterface.h"
+#include <MathLibraryInterface.h>

src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnSupport_Interface.h

@@ -78,8 +78,8 @@
 #ifndef BN_SUPPORT_INTERFACE_H
 #define BN_SUPPORT_INTERFACE_H
 // TODO_RENAME_INC_FOLDER:private refers to the TPM_CoreLib private headers
-#include "GpMacros.h"
-#include "CryptoInterface.h"
+#include "tpm_public/GpMacros.h"
+#include <CryptoInterface.h>
 #include "BnValues.h"
 
 //** BnSupportLibInit()

src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnValues.h

@@ -26,10 +26,10 @@
 #ifndef _BN_NUMBERS_H
 #define _BN_NUMBERS_H
 // TODO_RENAME_INC_FOLDER:private refers to the TPM_CoreLib private headers
-#include "TpmAlgorithmDefines.h"
-#include "GpMacros.h"  // required for TpmFail_fp.h
-#include "Capabilities.h"
-#include "TpmTypes.h"  // requires capabilities & GpMacros
+#include <tpm_public/TpmAlgorithmDefines.h>
+#include <tpm_public/GpMacros.h>  // required for TpmFail_fp.h
+#include <tpm_public/Capabilities.h>
+#include <tpm_public/TpmTypes.h>  // requires capabilities & GpMacros
 
 // These are the basic big number formats. This is convertible to the library-
 // specific format without too much difficulty. For the math performed using

src/tpm2/TPMCmd/tpm/cryptolibs/TpmBigNum/include/TpmBigNum/TpmToTpmBigNumMath.h

@@ -74,9 +74,9 @@
 #define MATH_LIB_TPMBIGNUM
 
 // TODO_RENAME_INC_FOLDER: private refers to the TPM_CoreLib private headers
-#include "GpMacros.h"  // required for TpmFail_fp.h
-#include "Capabilities.h"
-#include "TpmTypes.h"  // requires capabilities & GpMacros
+#include <tpm_public/GpMacros.h>  // required for TpmFail_fp.h
+#include <tpm_public/Capabilities.h>
+#include <tpm_public/TpmTypes.h>  // requires capabilities & GpMacros
 #include "BnValues.h"
 
 #ifndef LIB_INCLUDE
@@ -115,6 +115,6 @@
 // now include the math library functional interface and instantiate the
 // Crypt_Int & related types
 // TODO_RENAME_INC_FOLDER: This should have a Tpm_Cryptolib_Common component prefix.
-#include "MathLibraryInterface.h"
+#include <MathLibraryInterface.h>
 
 #endif  // _TPM_TO_TPMBIGNUM_MATH_H_

src/tpm2/TPMCmd/tpm/cryptolibs/common/include/CryptoInterface.h

@@ -43,7 +43,7 @@
 #ifndef CRYPTO_INTERFACE_H
 #define CRYPTO_INTERFACE_H
 
-#include "TpmBuildSwitches.h"
+#include "TpmConfiguration/TpmBuildSwitches.h"
 
 #if SIMULATION && CRYPTO_LIB_REPORTING
 

src/tpm2/TPMCmd/tpm/include/platform_interface/pcrstruct.h

@@ -66,9 +66,9 @@
 #ifndef _PCRSTRUCT_H_
 #define _PCRSTRUCT_H_
 
-#include "BaseTypes.h"
-#include "TpmAlgorithmDefines.h"
-#include "TpmTypes.h"
+#include <tpm_public/BaseTypes.h>
+#include <tpm_public/TpmAlgorithmDefines.h>
+#include <tpm_public/TpmTypes.h>
 
 // a single PCR
 typedef struct

src/tpm2/TPMCmd/tpm/include/platform_interface/platform_to_tpm_interface.h

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: BSD-2-Clause
+
+#include <platform_interface/prototypes/_TPM_Hash_Data_fp.h>
+#include <platform_interface/prototypes/_TPM_Hash_End_fp.h>
+#include <platform_interface/prototypes/_TPM_Hash_Start_fp.h>
+#include <platform_interface/prototypes/_TPM_Init_fp.h>
+#include <platform_interface/prototypes/ExecCommand_fp.h>
+#include <platform_interface/prototypes/Manufacture_fp.h>
+// TODO_RENAME_INC_FOLDER: public refers to the TPM_CoreLib public headers
+#include <tpm_public/prototypes/TpmFail_fp.h>

src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_pcr_fp.h

@@ -64,9 +64,9 @@
 #ifndef _PLATFORM_PCR_FP_H_
 #define _PLATFORM_PCR_FP_H_
 
-#include "BaseTypes.h"
-#include "TpmTypes.h"
-#include "pcrstruct.h"
+#include <tpm_public/BaseTypes.h>
+#include <tpm_public/TpmTypes.h>
+#include <platform_interface/pcrstruct.h>
 
 // return the number of PCRs the platform recognizes for GetPcrInitializationAttributes.
 // PCRs are numbered starting at zero.

src/tpm2/TPMCmd/tpm/include/platform_interface/prototypes/platform_virtual_nv_fp.h

@@ -3,8 +3,8 @@
 #ifndef _PLATFORM_VIRTUAL_FP_H_
 #define _PLATFORM_VIRTUAL_FP_H_
 
-#include "NV_Read_fp.h"
-#include "NV_ReadPublic_fp.h"
+#include <private/prototypes/NV_Read_fp.h>
+#include <private/prototypes/NV_ReadPublic_fp.h>
 
 // The ECC EK Cert and EK ICA Cert NV indexes are not populated like normal.
 // Data is generated on the fly and returned when NV_Read or NV_ReadPublic is

src/tpm2/TPMCmd/tpm/include/platform_interface/tpm_to_platform_interface.h

@@ -7,8 +7,8 @@
 #define _TPM_TO_PLATFORM_INTERFACE_H_
 
 // need to read configuration for ACT_SUPPORT flag check below
-#include "TpmBuildSwitches.h"
-#include "TpmProfile.h"
+#include <TpmConfiguration/TpmBuildSwitches.h>
+#include <TpmConfiguration/TpmProfile.h>
 #include <stddef.h>
 
 //** From Cancel.c
@@ -442,15 +442,15 @@ LIB_EXPORT size_t _plat_debug_snprintf(
 #endif  // ENABLE_TPM_DEBUG_PRINT
 
 // platform PCR initialization functions
-#include "platform_pcr_fp.h"
+#include <platform_interface/prototypes/platform_pcr_fp.h>
 
 // platform initialization functions
-#include "platform_init_fp.h"
+#include <platform_interface/prototypes/platform_init_fp.h>
 
 // platform failure mode functions
-#include "platform_failure_mode_fp.h"
+#include <platform_interface/prototypes/platform_failure_mode_fp.h>
 
 // platform virtual NV functions
-#include "platform_virtual_nv_fp.h"
+#include <platform_interface/prototypes/platform_virtual_nv_fp.h>
 
 #endif  // _TPM_TO_PLATFORM_INTERFACE_H_