- correct some prototypes, add some defines