diff --git a/SConstruct b/SConstruct
index a1284ec2e4..d9d05f7940 100644
--- a/SConstruct
+++ b/SConstruct
@@ -331,13 +331,13 @@ if GetOption("clazy"):
 Export('env', 'qt_env', 'arch', 'real_arch', 'SHARED', 'USE_WEBCAM')
 
 SConscript(['common/SConscript'])
-Import('_common', '_gpucommon', '_gpu_libs')
+Import('_common', '_gpucommon')
 
 if SHARED:
   common, gpucommon = abspath(common), abspath(gpucommon)
 else:
   common = [_common, 'json11']
-  gpucommon = [_gpucommon] + _gpu_libs
+  gpucommon = [_gpucommon]
 
 Export('common', 'gpucommon')
 
diff --git a/common/SConscript b/common/SConscript
index 575bdfa65c..ebc0ec79e9 100644
--- a/common/SConscript
+++ b/common/SConscript
@@ -22,13 +22,8 @@ files = [
   'visionimg.cc',
 ]
 
-if arch == "larch64":
-  _gpu_libs = ["GLESv2"]
-else:
-  _gpu_libs = ["GL"]
-
-_gpucommon = fxn('gpucommon', files, LIBS=_gpu_libs)
-Export('_common', '_gpucommon', '_gpu_libs')
+_gpucommon = fxn('gpucommon', files)
+Export('_common', '_gpucommon')
 
 if GetOption('test'):
   env.Program('tests/test_util', ['tests/test_util.cc'], LIBS=[_common])
diff --git a/selfdrive/loggerd/video_writer.cc b/selfdrive/loggerd/video_writer.cc
index a4f0734fc9..4f79ccafc8 100644
--- a/selfdrive/loggerd/video_writer.cc
+++ b/selfdrive/loggerd/video_writer.cc
@@ -1,3 +1,4 @@
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #include <cassert>
 #include <cstdlib>
 
diff --git a/selfdrive/modeld/runners/snpemodel.h b/selfdrive/modeld/runners/snpemodel.h
index ee5381d6a2..ba51fdced0 100644
--- a/selfdrive/modeld/runners/snpemodel.h
+++ b/selfdrive/modeld/runners/snpemodel.h
@@ -1,4 +1,5 @@
 #pragma once
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 
 #include <DlContainer/IDlContainer.hpp>
 #include <DlSystem/DlError.hpp>