Improved include.xml for code completion