diff --git a/SConstruct b/SConstruct
index 67acd3eac4..73c66690ad 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 9a6c990417..5b8de698a9 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 46cbae63fb..ad754b550b 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>