Don't use CPP for Haddock-only stuff. No uses of CPP left.