Fixed broken XIncludes

Change-Id: I51e45b9cbe1325218702c1ae8d9499f8aecb16d9