Remove symlink, move include files
Fix makefiles after header files moved