Bug 23838: (QA follow-up) Move include files