diff --git a/devices/common/i2c/saa7187.cpp b/devices/video/saa7187.cpp
similarity index 98%
rename from devices/common/i2c/saa7187.cpp
rename to devices/video/saa7187.cpp
index ea12f6f..3665277 100644
--- a/devices/common/i2c/saa7187.cpp
+++ b/devices/video/saa7187.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 /** @file SAA7187 Digital video encoder emulation. */
 
-#include <devices/common/i2c/saa7187.h>
+#include <devices/video/saa7187.h>
 #include <loguru.hpp>
 
 Saa7187VideoEncoder::Saa7187VideoEncoder(uint8_t dev_addr)
diff --git a/devices/common/i2c/saa7187.h b/devices/video/saa7187.h
similarity index 100%
rename from devices/common/i2c/saa7187.h
rename to devices/video/saa7187.h
diff --git a/devices/video/sixty6.cpp b/devices/video/sixty6.cpp
index 71b9b82..dc12e18 100644
--- a/devices/video/sixty6.cpp
+++ b/devices/video/sixty6.cpp
@@ -21,11 +21,11 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 /** @file TNT on-board NTSC/PAL video output emulation. */
 
-#include <devices/video/sixty6.h>
-#include <devices/video/control.h>
-#include <devices/common/i2c/saa7187.h>
 #include <devices/common/machineid.h>
 #include <devices/deviceregistry.h>
+#include <devices/video/control.h>
+#include <devices/video/sixty6.h>
+#include <loguru.hpp>
 #include <machines/machinebase.h>
 
 namespace loguru {
diff --git a/devices/video/sixty6.h b/devices/video/sixty6.h
index 2528aff..72c9e7c 100644
--- a/devices/video/sixty6.h
+++ b/devices/video/sixty6.h
@@ -25,6 +25,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #define SIXTY6_VIDEO_H
 
 #include <devices/ioctrl/macio.h>
+#include <devices/video/saa7187.h>
 #include <devices/video/videoctrl.h>
 
 #include <cinttypes>