Improved compatibility with long headers