diff --git a/multipy/runtime/deploy.cpp b/multipy/runtime/deploy.cpp
index d2cf4fe0..988f8388 100644
--- a/multipy/runtime/deploy.cpp
+++ b/multipy/runtime/deploy.cpp
@@ -5,7 +5,6 @@
 // LICENSE file in the root directory of this source tree.
 
 #include <dlfcn.h>
-#include <libgen.h>
 #include <multipy/runtime/Exception.h>
 #include <multipy/runtime/deploy.h>
 #include <unistd.h>
diff --git a/multipy/runtime/interpreter/builtin_registry.cpp b/multipy/runtime/interpreter/builtin_registry.cpp
index 485f384e..c80c7676 100644
--- a/multipy/runtime/interpreter/builtin_registry.cpp
+++ b/multipy/runtime/interpreter/builtin_registry.cpp
@@ -7,7 +7,6 @@
 #include <Python.h>
 #include <c10/util/Exception.h>
 #include <fmt/format.h>
-#include <multipy/runtime/Exception.h>
 #include <multipy/runtime/interpreter/builtin_registry.h>
 
 namespace torch {
diff --git a/multipy/runtime/interpreter/interpreter_impl.cpp b/multipy/runtime/interpreter/interpreter_impl.cpp
index 76e7ace0..bfe3edc5 100644
--- a/multipy/runtime/interpreter/interpreter_impl.cpp
+++ b/multipy/runtime/interpreter/interpreter_impl.cpp
@@ -9,7 +9,6 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-#include <fmt/format.h>
 #include <multipy/runtime/Exception.h>
 #include <multipy/runtime/interpreter/builtin_registry.h>
 #include <multipy/runtime/interpreter/import_find_sharedfuncptr.h>
@@ -30,7 +29,6 @@
 #include <thread>
 
 namespace py = pybind11;
-using namespace py::literals;
 
 // TODO this should come from cmake
 #define DEBUG 1
diff --git a/multipy/runtime/test_deploy.cpp b/multipy/runtime/test_deploy.cpp
index b559eab7..b7f66af7 100644
--- a/multipy/runtime/test_deploy.cpp
+++ b/multipy/runtime/test_deploy.cpp
@@ -6,11 +6,9 @@
 
 #include <ATen/Parallel.h>
 #include <gtest/gtest.h>
-#include <libgen.h>
 #include <cstring>
 
 #include <c10/util/irange.h>
-#include <libgen.h>
 #include <multipy/runtime/deploy.h>
 #include <torch/script.h>
 #include <torch/torch.h>
diff --git a/multipy/runtime/test_deploy_imports.cpp b/multipy/runtime/test_deploy_imports.cpp
index 579b0920..656a299d 100644
--- a/multipy/runtime/test_deploy_imports.cpp
+++ b/multipy/runtime/test_deploy_imports.cpp
@@ -6,7 +6,6 @@
 
 #include <ATen/Parallel.h>
 #include <gtest/gtest.h>
-#include <libgen.h>
 #include <cstring>
 
 #include <c10/util/irange.h>