Update header dependencies for Contech pass
Fix variable length types to better support serialize / deserialize across 32bit and 64bit