Fix includes for GUI stuff