repaired a manual merge fail ;), rm'd symlinks

"CFLAGS += -I.." in Makefile takes care of that