diff --git a/messaging/bridge.cc b/messaging/bridge.cc
index 8e29566ca26c64..da923835ae202f 100644
--- a/messaging/bridge.cc
+++ b/messaging/bridge.cc
@@ -8,8 +8,8 @@ typedef void (*sighandler_t)(int sig);
 
 #include "services.h"
 
-#include "impl_msgq.hpp"
-#include "impl_zmq.hpp"
+#include "impl_msgq.h"
+#include "impl_zmq.h"
 
 void sigpipe_handler(int sig) {
   assert(sig == SIGPIPE);
diff --git a/messaging/demo.cc b/messaging/demo.cc
index cfdf42209415fc..4c56ba0e2b3613 100644
--- a/messaging/demo.cc
+++ b/messaging/demo.cc
@@ -4,8 +4,8 @@
 #include <thread>
 #include <cassert>
 
-#include "messaging.hpp"
-#include "impl_zmq.hpp"
+#include "messaging.h"
+#include "impl_zmq.h"
 
 #define MSGS 1e5
 
diff --git a/messaging/impl_msgq.cc b/messaging/impl_msgq.cc
index d4ce1206032bad..862c94cb3e5140 100644
--- a/messaging/impl_msgq.cc
+++ b/messaging/impl_msgq.cc
@@ -6,7 +6,7 @@
 #include <cerrno>
 
 #include "services.h"
-#include "impl_msgq.hpp"
+#include "impl_msgq.h"
 
 
 volatile sig_atomic_t msgq_do_exit = 0;
diff --git a/messaging/impl_msgq.hpp b/messaging/impl_msgq.h
similarity index 96%
rename from messaging/impl_msgq.hpp
rename to messaging/impl_msgq.h
index 5761622abaab43..b67aae6222c2b5 100644
--- a/messaging/impl_msgq.hpp
+++ b/messaging/impl_msgq.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "messaging.hpp"
-#include "msgq.hpp"
+#include "messaging.h"
+#include "msgq.h"
 #include <zmq.h>
 #include <string>
 
diff --git a/messaging/impl_zmq.cc b/messaging/impl_zmq.cc
index dd03d27ec46bd4..aeed176ae814c6 100644
--- a/messaging/impl_zmq.cc
+++ b/messaging/impl_zmq.cc
@@ -7,7 +7,7 @@
 #include <zmq.h>
 
 #include "services.h"
-#include "impl_zmq.hpp"
+#include "impl_zmq.h"
 
 static int get_port(std::string endpoint) {
   int port = -1;
diff --git a/messaging/impl_zmq.hpp b/messaging/impl_zmq.h
similarity index 98%
rename from messaging/impl_zmq.hpp
rename to messaging/impl_zmq.h
index 037fb038dc2360..bb232049e034ba 100644
--- a/messaging/impl_zmq.hpp
+++ b/messaging/impl_zmq.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "messaging.hpp"
+#include "messaging.h"
 #include <zmq.h>
 #include <string>
 
diff --git a/messaging/messaging.cc b/messaging/messaging.cc
index 06bc66ae11b183..bfa634e612044e 100644
--- a/messaging/messaging.cc
+++ b/messaging/messaging.cc
@@ -1,6 +1,6 @@
-#include "messaging.hpp"
-#include "impl_zmq.hpp"
-#include "impl_msgq.hpp"
+#include "messaging.h"
+#include "impl_zmq.h"
+#include "impl_msgq.h"
 
 #ifdef __APPLE__
 const bool MUST_USE_ZMQ = true;
diff --git a/messaging/messaging.hpp b/messaging/messaging.h
similarity index 100%
rename from messaging/messaging.hpp
rename to messaging/messaging.h
diff --git a/messaging/messaging.pxd b/messaging/messaging.pxd
index 256f6ed516623b..de232da5f1b8f4 100644
--- a/messaging/messaging.pxd
+++ b/messaging/messaging.pxd
@@ -6,7 +6,7 @@ from libcpp.vector cimport vector
 from libcpp cimport bool
 
 
-cdef extern from "messaging.hpp":
+cdef extern from "messaging.h":
   cdef cppclass Context:
     @staticmethod
     Context * create()
diff --git a/messaging/msgq.cc b/messaging/msgq.cc
index ed09645d19d716..502f0695584312 100644
--- a/messaging/msgq.cc
+++ b/messaging/msgq.cc
@@ -21,7 +21,7 @@
 
 #include <stdio.h>
 
-#include "msgq.hpp"
+#include "msgq.h"
 
 void sigusr2_handler(int signal) {
   assert(signal == SIGUSR2);
diff --git a/messaging/msgq.hpp b/messaging/msgq.h
similarity index 100%
rename from messaging/msgq.hpp
rename to messaging/msgq.h
diff --git a/messaging/msgq_tests.cc b/messaging/msgq_tests.cc
index 01b2c7f5b71fce..dc10de6f58d85d 100644
--- a/messaging/msgq_tests.cc
+++ b/messaging/msgq_tests.cc
@@ -1,5 +1,5 @@
 #include "catch2/catch.hpp"
-#include "msgq.hpp"
+#include "msgq.h"
 
 TEST_CASE("ALIGN"){
   REQUIRE(ALIGN(0) == 0);
diff --git a/messaging/socketmaster.cc b/messaging/socketmaster.cc
index 5b63afbfaa507a..32c5f10f6418ef 100644
--- a/messaging/socketmaster.cc
+++ b/messaging/socketmaster.cc
@@ -2,7 +2,7 @@
 #include <assert.h>
 
 #include "services.h"
-#include "messaging.hpp"
+#include "messaging.h"
 
 static inline uint64_t nanos_since_boot() {
   struct timespec t;
diff --git a/visionipc/visionipc_client.h b/visionipc/visionipc_client.h
index 469976239a6d7e..d2c0085ad1dcb4 100644
--- a/visionipc/visionipc_client.h
+++ b/visionipc/visionipc_client.h
@@ -3,7 +3,7 @@
 #include <string>
 #include <unistd.h>
 
-#include "messaging.hpp"
+#include "messaging.h"
 #include "visionipc.h"
 #include "visionbuf.h"
 
diff --git a/visionipc/visionipc_server.cc b/visionipc/visionipc_server.cc
index 7c64cd8391341a..f4020133d955b8 100644
--- a/visionipc/visionipc_server.cc
+++ b/visionipc/visionipc_server.cc
@@ -7,7 +7,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "messaging.hpp"
+#include "messaging.h"
 #include "ipc.h"
 #include "visionipc_server.h"
 
diff --git a/visionipc/visionipc_server.h b/visionipc/visionipc_server.h
index 4472acf61c82c3..05c517b164a39d 100644
--- a/visionipc/visionipc_server.h
+++ b/visionipc/visionipc_server.h
@@ -5,7 +5,7 @@
 #include <atomic>
 #include <map>
 
-#include "messaging.hpp"
+#include "messaging.h"
 #include "visionipc.h"
 #include "visionbuf.h"