fixed some includes and cleaning additional shortcuts to libraries