bitmap header changes broke the testing code for the xarray. Fix the
issue by directly including the header into the actual xarray header.
This should at least make the error more pronounced in the future.
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>