Cleanup NO_PRIVATE_API ifndef blocks and related sources