included header registry support
xml cleanup