From 5e2570dc7555609e855370ab8afdade3640282c4 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Wed, 17 Nov 2021 11:40:17 -0800
Subject: [PATCH] Revert "Fix build failures in Ubuntu 21.10 (#22952)"

This reverts commit 61f9b3e653b08900e6a5011320f383efbe443c14.
---
 SConstruct                       | 1 -
 selfdrive/ui/navd/route_engine.h | 2 --
 selfdrive/ui/ui.h                | 1 -
 3 files changed, 4 deletions(-)

diff --git a/SConstruct b/SConstruct
index 67acd3eac4637f..73c66690ade338 100644
--- a/SConstruct
+++ b/SConstruct
@@ -189,7 +189,6 @@ env = Environment(
     "-Wno-inconsistent-missing-override",
     "-Wno-c99-designator",
     "-Wno-reorder-init-list",
-    "-Wno-error=unused-but-set-variable",
   ] + cflags + ccflags,
 
   CPPPATH=cpppath + [
diff --git a/selfdrive/ui/navd/route_engine.h b/selfdrive/ui/navd/route_engine.h
index 9a6c99041732aa..5b8de698a96bb3 100644
--- a/selfdrive/ui/navd/route_engine.h
+++ b/selfdrive/ui/navd/route_engine.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <optional>
-
 #include <QThread>
 #include <QGeoCoordinate>
 #include <QGeoManeuver>
diff --git a/selfdrive/ui/ui.h b/selfdrive/ui/ui.h
index 46cbae63fb035d..ad754b550b995a 100644
--- a/selfdrive/ui/ui.h
+++ b/selfdrive/ui/ui.h
@@ -3,7 +3,6 @@
 #include <map>
 #include <memory>
 #include <string>
-#include <optional>
 
 #include <QObject>
 #include <QTimer>