Replace with forward declarations if needed and includes in .cpp that now need them. The idea here is to have our headers have the least amount of impact as possible on our clients (e.g. compilation time).
