diff --git a/libcamera/common/Activities/ExynosCameraActivityAutofocus.h b/libcamera/common/Activities/ExynosCameraActivityAutofocus.h
index dc0a453..e6d2645 100644
--- a/libcamera/common/Activities/ExynosCameraActivityAutofocus.h
+++ b/libcamera/common/Activities/ExynosCameraActivityAutofocus.h
@@ -41,8 +41,8 @@
 #include <sys/types.h>
 #include <utils/threads.h>
 
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 #include <linux/vt.h>
 
 #include <utils/RefBase.h>
diff --git a/libcamera/common/Activities/ExynosCameraActivityBase.h b/libcamera/common/Activities/ExynosCameraActivityBase.h
index 4a92099..fa7494d 100644
--- a/libcamera/common/Activities/ExynosCameraActivityBase.h
+++ b/libcamera/common/Activities/ExynosCameraActivityBase.h
@@ -41,8 +41,8 @@
 #include <sys/types.h>
 #include <utils/threads.h>
 
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 #include <linux/vt.h>
 
 #include <utils/RefBase.h>
diff --git a/libcamera/common/Activities/ExynosCameraActivityFlash.h b/libcamera/common/Activities/ExynosCameraActivityFlash.h
index 062624b..bcce189 100644
--- a/libcamera/common/Activities/ExynosCameraActivityFlash.h
+++ b/libcamera/common/Activities/ExynosCameraActivityFlash.h
@@ -41,8 +41,8 @@
 #include <sys/types.h>
 #include <utils/threads.h>
 
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 #include <linux/vt.h>
 
 #include <utils/RefBase.h>
diff --git a/libcamera/common/Activities/ExynosCameraActivitySpecialCapture.h b/libcamera/common/Activities/ExynosCameraActivitySpecialCapture.h
index 543c32b..764f104 100644
--- a/libcamera/common/Activities/ExynosCameraActivitySpecialCapture.h
+++ b/libcamera/common/Activities/ExynosCameraActivitySpecialCapture.h
@@ -41,8 +41,8 @@
 #include <sys/types.h>
 #include <utils/threads.h>
 
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 #include <linux/vt.h>
 
 #include <utils/RefBase.h>
diff --git a/libcamera/common/Activities/ExynosCameraActivityUCTL.h b/libcamera/common/Activities/ExynosCameraActivityUCTL.h
index 2d0ebca..4d04bfe 100644
--- a/libcamera/common/Activities/ExynosCameraActivityUCTL.h
+++ b/libcamera/common/Activities/ExynosCameraActivityUCTL.h
@@ -41,8 +41,8 @@
 #include <sys/types.h>
 #include <utils/threads.h>
 
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 #include <linux/vt.h>
 
 #include <utils/RefBase.h>
diff --git a/libcamera/common/Buffers/ExynosCameraBuffer.h b/libcamera/common/Buffers/ExynosCameraBuffer.h
index c66a962..5fd01eb 100644
--- a/libcamera/common/Buffers/ExynosCameraBuffer.h
+++ b/libcamera/common/Buffers/ExynosCameraBuffer.h
@@ -32,8 +32,8 @@
 
 #include <binder/MemoryHeapBase.h>
 #include <hardware/camera.h>
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 
 #include "gralloc_priv.h"
 #include "ion.h"
diff --git a/libcamera/common/Buffers/ExynosCameraBufferLocker.h b/libcamera/common/Buffers/ExynosCameraBufferLocker.h
index 96981f4..3834f44 100644
--- a/libcamera/common/Buffers/ExynosCameraBufferLocker.h
+++ b/libcamera/common/Buffers/ExynosCameraBufferLocker.h
@@ -32,8 +32,8 @@
 #include <utils/threads.h>
 
 #include <hardware/camera.h>
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 
 #include "fimc-is-metadata.h"
 #include "ExynosCameraConfig.h"
diff --git a/libcamera/common/Buffers/ExynosCameraBufferManager.h b/libcamera/common/Buffers/ExynosCameraBufferManager.h
index 9f94c64..221ba2a 100644
--- a/libcamera/common/Buffers/ExynosCameraBufferManager.h
+++ b/libcamera/common/Buffers/ExynosCameraBufferManager.h
@@ -35,8 +35,8 @@
 
 #include <binder/MemoryHeapBase.h>
 #include <hardware/camera.h>
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 
 #include "gralloc_priv.h"
 #include "ion.h"
diff --git a/libcamera/common/ExynosCameraMemory.h b/libcamera/common/ExynosCameraMemory.h
index 98abe8c..6edb353 100644
--- a/libcamera/common/ExynosCameraMemory.h
+++ b/libcamera/common/ExynosCameraMemory.h
@@ -31,8 +31,8 @@
 
 #include <binder/MemoryHeapBase.h>
 #include <hardware/camera.h>
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 
 #include "gralloc_priv.h"
 #include "ion.h"
diff --git a/libcamera/common/ExynosCameraNode.h b/libcamera/common/ExynosCameraNode.h
index 268edf6..f500a9f 100644
--- a/libcamera/common/ExynosCameraNode.h
+++ b/libcamera/common/ExynosCameraNode.h
@@ -41,8 +41,8 @@
 #include <sys/types.h>
 #include <utils/threads.h>
 
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 #include <linux/vt.h>
 
 #include <utils/RefBase.h>
diff --git a/libcamera/common/ExynosCameraUtils.h b/libcamera/common/ExynosCameraUtils.h
index d1e2676..ba968e9 100644
--- a/libcamera/common/ExynosCameraUtils.h
+++ b/libcamera/common/ExynosCameraUtils.h
@@ -26,10 +26,11 @@
 #include "ExynosRect.h"
 #include "fimc-is-metadata.h"
 #include "ExynosCameraSensorInfo.h"
-#include "videodev2_exynos_media.h"
 #include "ExynosCameraBuffer.h"
 #include "ExynosCameraConfig.h"
 
+#include <linux/videodev2_exynos_media.h>
+
 #define ROUND_OFF(x, dig)           (floor((x) * pow(10.0f, dig)) / pow(10.0f, dig))
 
 namespace android {