Removed un-needed ncurses test, fixed include lines on various sources to reflect new makefile