diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp
index c16e755f4..e92bca427 100644
--- a/src/android/camera_capabilities.cpp
+++ b/src/android/camera_capabilities.cpp
@@ -378,7 +378,7 @@ void CameraCapabilities::computeHwLevel(
 	hwLevel_ = hwLevel;
 }
 
-int CameraCapabilities::initialize(std::shared_ptr<libcamera::Camera> camera,
+int CameraCapabilities::initialize(std::shared_ptr<Camera> camera,
 				   int orientation, int facing)
 {
 	camera_ = camera;
@@ -429,7 +429,7 @@ CameraCapabilities::initializeYUVResolutions(const PixelFormat &pixelFormat,
 }
 
 std::vector<Size>
-CameraCapabilities::initializeRawResolutions(const libcamera::PixelFormat &pixelFormat)
+CameraCapabilities::initializeRawResolutions(const PixelFormat &pixelFormat)
 {
 	std::unique_ptr<CameraConfiguration> cameraConfig =
 		camera_->generateConfiguration({ StreamRole::Raw });
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 8ca76719a..d782067ee 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -746,8 +746,8 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
 }
 
 FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer,
-					     libcamera::PixelFormat pixelFormat,
-					     const libcamera::Size &size)
+					     PixelFormat pixelFormat,
+					     const Size &size)
 {
 	FileDescriptor fd;
 	/*
@@ -1140,7 +1140,7 @@ void CameraDevice::requestComplete(Request *request)
 	if (!resultMetadata) {
 		notifyError(descriptor.frameNumber_, nullptr, CAMERA3_MSG_ERROR_RESULT);
 
-		/* The camera framework expects an empy metadata pack on error. */
+		/* The camera framework expects an empty metadata pack on error. */
 		resultMetadata = std::make_unique<CameraMetadata>(0, 0);
 	}
 
diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp
index 01909ec71..0f5ae947b 100644
--- a/src/android/camera_stream.cpp
+++ b/src/android/camera_stream.cpp
@@ -98,7 +98,7 @@ int CameraStream::configure()
 	return 0;
 }
 
-int CameraStream::process(const libcamera::FrameBuffer &source,
+int CameraStream::process(const FrameBuffer &source,
 			  buffer_handle_t camera3Dest,
 			  const CameraMetadata &requestMetadata,
 			  CameraMetadata *resultMetadata)
@@ -139,7 +139,7 @@ FrameBuffer *CameraStream::getBuffer()
 	return buffer;
 }
 
-void CameraStream::putBuffer(libcamera::FrameBuffer *buffer)
+void CameraStream::putBuffer(FrameBuffer *buffer)
 {
 	if (!allocator_)
 		return;
diff --git a/src/android/camera_worker.cpp b/src/android/camera_worker.cpp
index 98dddd9eb..913131830 100644
--- a/src/android/camera_worker.cpp
+++ b/src/android/camera_worker.cpp
@@ -27,7 +27,7 @@ LOG_DECLARE_CATEGORY(HAL)
  * by the CameraWorker which queues it to the libcamera::Camera after handling
  * fences.
  */
-CaptureRequest::CaptureRequest(libcamera::Camera *camera)
+CaptureRequest::CaptureRequest(Camera *camera)
 	: camera_(camera)
 {
 	request_ = camera_->createRequest(reinterpret_cast<uint64_t>(this));
diff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp
index 449933796..ec45e04c7 100644
--- a/src/android/mm/cros_camera_buffer.cpp
+++ b/src/android/mm/cros_camera_buffer.cpp
@@ -21,7 +21,7 @@ class CameraBuffer::Private : public Extensible::Private
 
 public:
 	Private(CameraBuffer *cameraBuffer, buffer_handle_t camera3Buffer,
-		libcamera::PixelFormat pixelFormat, const libcamera::Size &size,
+		PixelFormat pixelFormat, const Size &size,
 		int flags);
 	~Private();
 
@@ -53,8 +53,8 @@ private:
 
 CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer,
 			       buffer_handle_t camera3Buffer,
-			       [[maybe_unused]] libcamera::PixelFormat pixelFormat,
-			       [[maybe_unused]] const libcamera::Size &size,
+			       [[maybe_unused]] PixelFormat pixelFormat,
+			       [[maybe_unused]] const Size &size,
 			       [[maybe_unused]] int flags)
 	: handle_(camera3Buffer), numPlanes_(0), mapped_(false),
 	  registered_(false)
diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp
index 22efc4d4b..27a30e2d6 100644
--- a/src/android/mm/generic_camera_buffer.cpp
+++ b/src/android/mm/generic_camera_buffer.cpp
@@ -20,14 +20,13 @@ using namespace libcamera;
 LOG_DECLARE_CATEGORY(HAL)
 
 class CameraBuffer::Private : public Extensible::Private,
-			      public libcamera::MappedBuffer
+			      public MappedBuffer
 {
 	LIBCAMERA_DECLARE_PUBLIC(CameraBuffer)
 
 public:
 	Private(CameraBuffer *cameraBuffer, buffer_handle_t camera3Buffer,
-		libcamera::PixelFormat pixelFormat, const libcamera::Size &size,
-		int flags);
+		PixelFormat pixelFormat, const Size &size, int flags);
 	~Private();
 
 	unsigned int numPlanes() const;
@@ -58,13 +57,13 @@ private:
 
 CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer,
 			       buffer_handle_t camera3Buffer,
-			       libcamera::PixelFormat pixelFormat,
-			       const libcamera::Size &size, int flags)
+			       PixelFormat pixelFormat,
+			       const Size &size, int flags)
 	: fd_(-1), flags_(flags), bufferLength_(-1), mapped_(false)
 {
 	error_ = 0;
 
-	const auto &info = libcamera::PixelFormatInfo::info(pixelFormat);
+	const auto &info = PixelFormatInfo::info(pixelFormat);
 	if (!info.isValid()) {
 		error_ = -EINVAL;
 		LOG(HAL, Error) << "Invalid pixel format: "