Moved include files of library
Oops, forgot to add other modified files