Evolving the architecture a bit

Xcode definitely doesn't get along well with C++ code full of headers.
But then again, what IDE does?