Removed four includes from legacyheaders/typedefs.h