Revert "Prevent unnecessary preprocessor include by implementors"

This reverts commit 5c241c1e2997718a61e808b7c0a133b0da22d0a5
which makes no difference.