Revert "Makefile: more makefile changes to fix compiling errors"

This reverts commit 44d0a9f01e8acd65bea3e594dfb0660c413d1ae4.