diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript
index b56972ae02..e780d8d569 100644
--- a/selfdrive/ui/SConscript
+++ b/selfdrive/ui/SConscript
@@ -64,7 +64,7 @@ if arch == 'x86_64' and os.path.exists(Dir("#tools/").get_abspath()):
   qt_env['CXXFLAGS'] += ["-Wno-deprecated-declarations"]
 
   replay_lib_src = ["replay/replay.cc", "replay/Unlogger.cc",
-                    "replay/FileReader.cc", "#tools/clib/FrameReader.cpp"]
+                    "replay/FileReader.cc", "#tools/clib/FrameReader.cc"]
 
   replay_lib = qt_env.Library("qt_replay", replay_lib_src, LIBS=base_libs)
   replay_libs = [replay_lib, 'avutil', 'avcodec', 'avformat', 'swscale', 'bz2'] + qt_libs
diff --git a/selfdrive/ui/replay/FileReader.cc b/selfdrive/ui/replay/FileReader.cc
index 2165379995..e5963fdac4 100644
--- a/selfdrive/ui/replay/FileReader.cc
+++ b/selfdrive/ui/replay/FileReader.cc
@@ -1,5 +1,5 @@
 #include "FileReader.h"
-#include "FrameReader.hpp"
+#include "FrameReader.h"
 
 #include <QtNetwork>
 
diff --git a/selfdrive/ui/replay/FileReader.h b/selfdrive/ui/replay/FileReader.h
index 514758e10f..306025307c 100644
--- a/selfdrive/ui/replay/FileReader.h
+++ b/selfdrive/ui/replay/FileReader.h
@@ -16,7 +16,7 @@
 #include "cereal/gen/cpp/log.capnp.h"
 
 #include <thread>
-#include "channel.hpp"
+#include "channel.h"
 
 class FileReader : public QObject {
   Q_OBJECT
diff --git a/selfdrive/ui/replay/Unlogger.h b/selfdrive/ui/replay/Unlogger.h
index 923d41e2f8..b480e681aa 100644
--- a/selfdrive/ui/replay/Unlogger.h
+++ b/selfdrive/ui/replay/Unlogger.h
@@ -5,7 +5,7 @@
 #include "clutil.h"
 #include "messaging.hpp"
 #include "FileReader.h"
-#include "FrameReader.hpp"
+#include "FrameReader.h"
 #include "visionipc_server.h"
 
 class Unlogger : public QObject {
diff --git a/selfdrive/ui/replay/replay.h b/selfdrive/ui/replay/replay.h
index ea6f0e6a12..d2a6874645 100644
--- a/selfdrive/ui/replay/replay.h
+++ b/selfdrive/ui/replay/replay.h
@@ -11,7 +11,7 @@
 #include "qt/api.h"
 #include "Unlogger.h"
 #include "FileReader.h"
-#include "FrameReader.hpp"
+#include "FrameReader.h"
 #include "visionipc_server.h"
 
 #include "common/util.h"
diff --git a/tools/clib/FrameReader.cpp b/tools/clib/FrameReader.cc
similarity index 99%
rename from tools/clib/FrameReader.cpp
rename to tools/clib/FrameReader.cc
index 8048dbffdc..ef0e241ca1 100644
--- a/tools/clib/FrameReader.cpp
+++ b/tools/clib/FrameReader.cc
@@ -1,4 +1,4 @@
-#include "FrameReader.hpp"
+#include "FrameReader.h"
 #include <assert.h>
 #include <unistd.h>
 
diff --git a/tools/clib/FrameReader.hpp b/tools/clib/FrameReader.h
similarity index 97%
rename from tools/clib/FrameReader.hpp
rename to tools/clib/FrameReader.h
index 472444a780..40af60e554 100644
--- a/tools/clib/FrameReader.hpp
+++ b/tools/clib/FrameReader.h
@@ -9,7 +9,7 @@
 #include <list>
 #include <condition_variable>
 
-#include "channel.hpp"
+#include "channel.h"
 
 // independent of QT, needs ffmpeg
 extern "C" {
diff --git a/tools/clib/SConscript b/tools/clib/SConscript
index 6f33fe75bc..460eb22411 100644
--- a/tools/clib/SConscript
+++ b/tools/clib/SConscript
@@ -4,5 +4,5 @@ env['CPPPATH'] += [get_paths()['include']]
 
 from Cython.Build import cythonize
 cythonize("cframereader.pyx")
-env.SharedLibrary(File('cframereader.so'), ['cframereader.cpp', 'FrameReader.cpp'], LIBS=['avformat', 'avcodec', 'avutil', 'swscale'])
+env.SharedLibrary(File('cframereader.so'), ['cframereader.cpp', 'FrameReader.cc'], LIBS=['avformat', 'avcodec', 'avutil', 'swscale'])
 
diff --git a/tools/clib/cframereader.pyx b/tools/clib/cframereader.pyx
index ffbc277587..cdbd65da6c 100644
--- a/tools/clib/cframereader.pyx
+++ b/tools/clib/cframereader.pyx
@@ -1,7 +1,7 @@
 # distutils: language = c++
 # cython: language_level=3
 
-cdef extern from "FrameReader.hpp":
+cdef extern from "FrameReader.h":
   cdef cppclass CFrameReader "FrameReader":
     CFrameReader(const char *)
     char *get(int)
diff --git a/tools/clib/channel.hpp b/tools/clib/channel.h
similarity index 100%
rename from tools/clib/channel.hpp
rename to tools/clib/channel.h