Modified public header directive as well to include more include files