Add missing file and update makefiles