diff --git a/experiments/drive.cpp b/experiments/drive.cpp
index 22fd4b6..5fdbcf4 100644
--- a/experiments/drive.cpp
+++ b/experiments/drive.cpp
@@ -25,6 +25,9 @@
 #include <memory>
 #include <tuple>
 
+namespace pid_control
+{
+
 using tstamp = std::chrono::high_resolution_clock::time_point;
 
 #define DRIVE_TIME 1
@@ -259,3 +262,5 @@
 
     return 0;
 }
+
+} // namespace pid_control
diff --git a/experiments/drive.hpp b/experiments/drive.hpp
index 94e74f3..e1a4d2d 100644
--- a/experiments/drive.hpp
+++ b/experiments/drive.hpp
@@ -1,3 +1,8 @@
 #pragma once
 
+namespace pid_control
+{
+
 int driveMain(void);
+
+}