CDK-473: Moved header check to a util method in Compatibility

Closes #151