Ken-g6 fixed #include order