Removed open namespaces in header files.
Removed some unnecessary includes in header files.