diff --git a/release/files_common b/release/files_common
index a835fa06..a5de5996 100644
--- a/release/files_common
+++ b/release/files_common
@@ -398,7 +398,8 @@ selfdrive/modeld/models/driving.h
 selfdrive/modeld/models/dmonitoring.cc
 selfdrive/modeld/models/dmonitoring.h
 
-selfdrive/modeld/transforms/loadyuv.[c,h]
+selfdrive/modeld/transforms/loadyuv.cc
+selfdrive/modeld/transforms/loadyuv.h
 selfdrive/modeld/transforms/loadyuv.cl
 selfdrive/modeld/transforms/transform.cc
 selfdrive/modeld/transforms/transform.h
diff --git a/selfdrive/modeld/SConscript b/selfdrive/modeld/SConscript
index 569bcf0e..9b34398c 100644
--- a/selfdrive/modeld/SConscript
+++ b/selfdrive/modeld/SConscript
@@ -8,7 +8,7 @@ TEST_THNEED = False
 common_src = [
   "models/commonmodel.cc",
   "runners/snpemodel.cc",
-  "transforms/loadyuv.c",
+  "transforms/loadyuv.cc",
   "transforms/transform.cc"
 ]
 
diff --git a/selfdrive/modeld/transforms/loadyuv.c b/selfdrive/modeld/transforms/loadyuv.cc
similarity index 99%
rename from selfdrive/modeld/transforms/loadyuv.c
rename to selfdrive/modeld/transforms/loadyuv.cc
index 6fbc94a1..fe84e6d2 100644
--- a/selfdrive/modeld/transforms/loadyuv.c
+++ b/selfdrive/modeld/transforms/loadyuv.cc
@@ -1,8 +1,5 @@
 #include <string.h>
 #include <assert.h>
-
-#include "clutil.h"
-
 #include "loadyuv.h"
 
 void loadyuv_init(LoadYUVState* s, cl_context ctx, cl_device_id device_id, int width, int height) {
diff --git a/selfdrive/modeld/transforms/loadyuv.h b/selfdrive/modeld/transforms/loadyuv.h
index be7ea212..dbef4614 100644
--- a/selfdrive/modeld/transforms/loadyuv.h
+++ b/selfdrive/modeld/transforms/loadyuv.h
@@ -1,18 +1,8 @@
-#ifndef LOADYUV_H
-#define LOADYUV_H
+#pragma once
 
 #include <inttypes.h>
 #include <stdbool.h>
-
-#ifdef __APPLE__
-#include <OpenCL/cl.h>
-#else
-#include <CL/cl.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "clutil.h"
 
 typedef struct {
   int width, height;
@@ -26,9 +16,3 @@ void loadyuv_destroy(LoadYUVState* s);
 void loadyuv_queue(LoadYUVState* s, cl_command_queue q,
                    cl_mem y_cl, cl_mem u_cl, cl_mem v_cl,
                    cl_mem out_cl);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // LOADYUV_H
diff --git a/selfdrive/modeld/visiontest.mk b/selfdrive/modeld/visiontest.mk
index 2c72c4cf..82c6798f 100644
--- a/selfdrive/modeld/visiontest.mk
+++ b/selfdrive/modeld/visiontest.mk
@@ -49,7 +49,7 @@ all: visiontest
 
 libvisiontest_inputs := visiontest.c \
                         transforms/transform.cc \
-                        transforms/loadyuv.c \
+                        transforms/loadyuv.cc \
                         ../common/clutil.cc \
                         $(BASEDIR)/selfdrive/common/util.c \
                         $(CEREAL_OBJS)