diff --git a/TPMCmd/Platform/src/VendorInfo.c b/TPMCmd/Platform/src/VendorInfo.c
index d3d38321..746f76bc 100644
--- a/TPMCmd/Platform/src/VendorInfo.c
+++ b/TPMCmd/Platform/src/VendorInfo.c
@@ -29,7 +29,7 @@ static uint32_t StringToUint32(char s[4])
 
 // return the 4 character Manufacturer Capability code.  This
 // should come from the platform library since that is provided by the manufacturer
-LIB_EXPORT uint32_t _plat__GetManufacturerCapabilityCode()
+LIB_EXPORT uint32_t _plat__GetManufacturerCapabilityCode(void)
 {
     return StringToUint32(MANUFACTURER);
 }
@@ -56,14 +56,14 @@ LIB_EXPORT uint32_t _plat__GetVendorCapabilityCode(int index)
 
 // return the most-significant 32-bits of the TPM Firmware Version reported by
 // getCapability.
-LIB_EXPORT uint32_t _plat__GetTpmFirmwareVersionHigh()
+LIB_EXPORT uint32_t _plat__GetTpmFirmwareVersionHigh(void)
 {
     return FIRMWARE_V1;
 }
 
 // return the least-significant 32-bits of the TPM Firmware Version reported by
 // getCapability.
-LIB_EXPORT uint32_t _plat__GetTpmFirmwareVersionLow()
+LIB_EXPORT uint32_t _plat__GetTpmFirmwareVersionLow(void)
 {
     return FIRMWARE_V2;
 }
diff --git a/TPMCmd/tpm/cryptolibs/TpmBigNum/TpmBigNumThunks.c b/TPMCmd/tpm/cryptolibs/TpmBigNum/TpmBigNumThunks.c
index 3878ffe4..2ce78735 100644
--- a/TPMCmd/tpm/cryptolibs/TpmBigNum/TpmBigNumThunks.c
+++ b/TPMCmd/tpm/cryptolibs/TpmBigNum/TpmBigNumThunks.c
@@ -19,6 +19,7 @@ LIB_EXPORT int ExtMath_LibInit(void)
     return BnSupportLibInit();
 }
 
+#if LIBRARY_COMPATIBILITY_CHECK
 //** MathLibraryCompatibililtyCheck()
 // This function is only used during development to make sure that the library
 // that is being referenced is using the same size of data structures as the TPM.
@@ -26,6 +27,7 @@ LIB_EXPORT BOOL ExtMath_Debug_CompatibilityCheck(void)
 {
     return BnMathLibraryCompatibilityCheck();
 }
+#endif
 
 // ***************************************************************************
 // Integer/Number Functions (non-ECC)
diff --git a/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnValues.h b/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnValues.h
index 0cb72cfc..686b8eb4 100644
--- a/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnValues.h
+++ b/TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnValues.h
@@ -128,7 +128,7 @@ extern const bignum_t BnConstZero;
 // This is used to create a word-size bigNum and initialize it with
 // an input parameter to a function.
 #define BN_WORD_INITIALIZED(name, initial) \
-    BN_STRUCT(RADIX_BITS) name##_;         \
+    BN_STRUCT(name, RADIX_BITS) name##_;         \
     bigNum name = BnInitializeWord(        \
         (bigNum) & name##_, BN_STRUCT_ALLOCATION(RADIX_BITS), initial)
 
diff --git a/TPMCmd/tpm/include/platform_interface/tpm_to_platform_interface.h b/TPMCmd/tpm/include/platform_interface/tpm_to_platform_interface.h
index 7b55c85f..edc5760e 100644
--- a/TPMCmd/tpm/include/platform_interface/tpm_to_platform_interface.h
+++ b/TPMCmd/tpm/include/platform_interface/tpm_to_platform_interface.h
@@ -325,7 +325,7 @@ LIB_EXPORT void _plat__GetPlatformManufactureData(uint8_t* pPlatformPersistentDa
 
 // return the 4 character Manufacturer Capability code.  This
 // should come from the platform library since that is provided by the manufacturer
-LIB_EXPORT uint32_t _plat__GetManufacturerCapabilityCode();
+LIB_EXPORT uint32_t _plat__GetManufacturerCapabilityCode(void);
 
 // return the 4 character VendorStrings for Capabilities.
 // Index is ONE-BASED, and may be in the range [1,4] inclusive.
@@ -335,11 +335,11 @@ LIB_EXPORT uint32_t _plat__GetVendorCapabilityCode(int index);
 
 // return the most-significant 32-bits of the TPM Firmware Version reported by
 // getCapability.
-LIB_EXPORT uint32_t _plat__GetTpmFirmwareVersionHigh();
+LIB_EXPORT uint32_t _plat__GetTpmFirmwareVersionHigh(void);
 
 // return the least-significant 32-bits of the TPM Firmware Version reported by
 // getCapability.
-LIB_EXPORT uint32_t _plat__GetTpmFirmwareVersionLow();
+LIB_EXPORT uint32_t _plat__GetTpmFirmwareVersionLow(void);
 
 // return the TPM Firmware's current SVN.
 LIB_EXPORT uint16_t _plat__GetTpmFirmwareSvn(void);
@@ -377,7 +377,7 @@ LIB_EXPORT int _plat__GetTpmFirmwareSecret(
 #endif  // FW_LIMITED_SUPPORT
 
 // return the TPM Type returned by TPM_PT_VENDOR_TPM_TYPE
-LIB_EXPORT uint32_t _plat__GetTpmType();
+LIB_EXPORT uint32_t _plat__GetTpmType(void);
 
 // platform PCR initialization functions
 #include <platform_interface/prototypes/platform_pcr_fp.h>
diff --git a/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Util.c b/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Util.c
index ded842ab..43220d5b 100644
--- a/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Util.c
+++ b/TPMCmd/tpm/src/crypt/ecc/TpmEcc_Util.c
@@ -2,7 +2,7 @@
 // This file contains utility functions to help using the external Math library
 // for Ecc functions.
 #include "Tpm.h"
-#include "TpmMath_Util_fp.h"
+#include "TpmEcc_Util_fp.h"
 
 #if ALG_ECC
 
@@ -59,4 +59,4 @@ LIB_EXPORT BOOL TpmEcc_PointTo2B(
         ecP, p->x.t.buffer, &p->x.t.size, p->y.t.buffer, &p->y.t.size);
 }
 
-#endif  // ALG_ECC
\ No newline at end of file
+#endif  // ALG_ECC