diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp
index d57ffa75edeb..64e96264c90b 100644
--- a/test/camera/buffer_import.cpp
+++ b/test/camera/buffer_import.cpp
@@ -12,6 +12,9 @@
 #include <numeric>
 #include <vector>
 
+#include <libcamera/event_dispatcher.h>
+#include <libcamera/timer.h>
+
 #include "libcamera/internal/device_enumerator.h"
 #include "libcamera/internal/media_device.h"
 #include "libcamera/internal/v4l2_videodevice.h"
diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp
index eb67bf2da71f..51bbd25809ee 100644
--- a/test/camera/capture.cpp
+++ b/test/camera/capture.cpp
@@ -7,6 +7,10 @@
 
 #include <iostream>
 
+#include <libcamera/event_dispatcher.h>
+#include <libcamera/framebuffer_allocator.h>
+#include <libcamera/timer.h>
+
 #include "camera_test.h"
 #include "test.h"
 
diff --git a/test/camera/statemachine.cpp b/test/camera/statemachine.cpp
index 0bda6fe4b0b2..28faeb913f2e 100644
--- a/test/camera/statemachine.cpp
+++ b/test/camera/statemachine.cpp
@@ -7,6 +7,8 @@
 
 #include <iostream>
 
+#include <libcamera/framebuffer_allocator.h>
+
 #include "camera_test.h"
 #include "test.h"
 
diff --git a/test/libtest/buffer_source.h b/test/libtest/buffer_source.h
index 95a82a8229fa..14b4770e8d8a 100644
--- a/test/libtest/buffer_source.h
+++ b/test/libtest/buffer_source.h
@@ -7,7 +7,7 @@
 #ifndef __LIBCAMERA_BUFFER_SOURCE_TEST_H__
 #define __LIBCAMERA_BUFFER_SOURCE_TEST_H__
 
-#include <libcamera/libcamera.h>
+#include <libcamera/stream.h>
 
 #include "libcamera/internal/media_device.h"
 #include "libcamera/internal/v4l2_videodevice.h"
diff --git a/test/libtest/camera_test.h b/test/libtest/camera_test.h
index 0b6bad05e37c..7939798f886e 100644
--- a/test/libtest/camera_test.h
+++ b/test/libtest/camera_test.h
@@ -7,7 +7,10 @@
 #ifndef __LIBCAMERA_CAMERA_TEST_H__
 #define __LIBCAMERA_CAMERA_TEST_H__
 
-#include <libcamera/libcamera.h>
+#include <memory>
+
+#include <libcamera/camera.h>
+#include <libcamera/camera_manager.h>
 
 using namespace libcamera;
 
diff --git a/test/mapped-buffer.cpp b/test/mapped-buffer.cpp
index 39d624cde6d5..027923375ed9 100644
--- a/test/mapped-buffer.cpp
+++ b/test/mapped-buffer.cpp
@@ -7,6 +7,8 @@
 
 #include <iostream>
 
+#include <libcamera/framebuffer_allocator.h>
+
 #include "libcamera/internal/buffer.h"
 
 #include "camera_test.h"