Update makefiles for extra