Minor changes with #include statements

I believe I was missing some #include statements; I know I more than likely have a bunch of them being repeated at the moment, but that's better than having some missing, at least for the mean time. Going to try and have it working first and then go from there, ya know?