changed some header includes related to aring-qq