Cleaned up map gen includes.
Updated linux build