Optimized away more includes, readded some #includes for necessary
prototypes.

33 files changed