Improved internal headers.