Cleared includes from the header files