Fixed the #includes and the header file declarations