* Cleaned some header files, deleting unused includes