A few headers were including other headers when a forward declaration
can be used instead, allowing the include to be moved to the cpp file.