Makefile refactored to move definitions in Defines.mk