Added support code refactor to all Makefiles.