Revert "Revert "Make carla compile in master""

This reverts commit b12e6b773c8dbc64bc5d709bb0f3dfe9fafcfe43.