Removed Include.h and reoganized includes