Cleaning/correcting various #include statements

Authored by thomasfischer on Dec 29 2018, 9:51 PM.