Pulled commonly used header files into Apigee.h
Removed auto-generated created by comments
Removed unneeded import statements