Standard 1.1 header support (Mantis 1199) from Andrew Plotkin