Remove the rest of the unneeded prtypes.h inclusions
Reduce some content/ #includes