- Move malloc.c to memory.c - Generate parser/lexer files before actually compiling anything else that uses them - Fix up header inclusion mess