Revert omitted make file changes and add full.mk