Use the new #include layout provided by extract-headers.sh

Signed-off-by: David Greaves <david@dgreaves.com>