refactored most header files to use includes closer to what they're supposed to be