* removed more files and fixed some include paths