Cleaned up unused dependencies, includes and typedefs