Bring cabal_macros.h into doctests CPP; revert parent.