Updated Makefile and asm/types.h