issue #2905: modify makefile to include correct header files