Cleanup, h includes moved