Revert "fixed includes in some Makefiles"

This reverts commit cae9b856e028ecd25e1fd78857a3484c7113ba9d.