Combine headers in mxt-app to fix compilation errors

Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>