comply to the new headers in core