Fixed include file paths, and made xbithack work