Header file cleanup. platform.h apparently needs to be included early on so it