diff --git a/spa/plugins/libcamera/libcamera-manager.cpp b/spa/plugins/libcamera/libcamera-manager.cpp
index 3aaf65d99..ad03a5582 100644
--- a/spa/plugins/libcamera/libcamera-manager.cpp
+++ b/spa/plugins/libcamera/libcamera-manager.cpp
@@ -61,7 +61,7 @@ struct device {
 	std::shared_ptr<Camera> camera;
 };
 
-typedef struct impl {
+struct impl {
 	struct spa_handle handle;
 	struct spa_device device = {};
 
@@ -80,7 +80,7 @@ typedef struct impl {
 	uint32_t n_devices = 0;
 
 	impl(spa_log *log);
-} Impl;
+};
 
 }
 
@@ -168,7 +168,7 @@ static int emit_object_info(struct impl *impl, struct device *device)
 	return 1;
 }
 
-void Impl::addCamera(std::shared_ptr<Camera> camera)
+void impl::addCamera(std::shared_ptr<Camera> camera)
 {
 	struct impl *impl = this;
 	struct device *device;
@@ -184,7 +184,7 @@ void Impl::addCamera(std::shared_ptr<Camera> camera)
 	emit_object_info(impl, device);
 }
 
-void Impl::removeCamera(std::shared_ptr<Camera> camera)
+void impl::removeCamera(std::shared_ptr<Camera> camera)
 {
 	struct impl *impl = this;
 	struct device *device;
@@ -198,16 +198,16 @@ void Impl::removeCamera(std::shared_ptr<Camera> camera)
 
 static int start_monitor(struct impl *impl)
 {
-	impl->manager->cameraAdded.connect(impl, &Impl::addCamera);
-	impl->manager->cameraRemoved.connect(impl, &Impl::removeCamera);
+	impl->manager->cameraAdded.connect(impl, &impl::addCamera);
+	impl->manager->cameraRemoved.connect(impl, &impl::removeCamera);
 	return 0;
 }
 
 static int stop_monitor(struct impl *impl)
 {
 	if (impl->manager) {
-		impl->manager->cameraAdded.disconnect(impl, &Impl::addCamera);
-		impl->manager->cameraRemoved.disconnect(impl, &Impl::removeCamera);
+		impl->manager->cameraAdded.disconnect(impl, &impl::addCamera);
+		impl->manager->cameraRemoved.disconnect(impl, &impl::removeCamera);
 	}
 	clear_devices (impl);
 	return 0;
diff --git a/spa/plugins/libcamera/libcamera-source.cpp b/spa/plugins/libcamera/libcamera-source.cpp
index 04e4724d5..9b6d8246d 100644
--- a/spa/plugins/libcamera/libcamera-source.cpp
+++ b/spa/plugins/libcamera/libcamera-source.cpp
@@ -136,7 +136,7 @@ struct port {
 	}
 };
 
-typedef struct impl {
+struct impl {
 	struct spa_handle handle;
 	struct spa_node node = {};
 
@@ -180,7 +180,7 @@ typedef struct impl {
 
 	impl(spa_log *log, spa_loop *data_loop, spa_system *system,
 	     std::shared_ptr<CameraManager> manager, std::shared_ptr<Camera> camera, std::string device_id);
-} Impl;
+};
 
 }
 
diff --git a/spa/plugins/libcamera/libcamera-utils.cpp b/spa/plugins/libcamera/libcamera-utils.cpp
index ff1f5ca91..db81a11cd 100644
--- a/spa/plugins/libcamera/libcamera-utils.cpp
+++ b/spa/plugins/libcamera/libcamera-utils.cpp
@@ -604,7 +604,7 @@ spa_libcamera_alloc_buffers(struct impl *impl, struct port *port,
 }
 
 
-void Impl::requestComplete(libcamera::Request *request)
+void impl::requestComplete(libcamera::Request *request)
 {
 	struct impl *impl = this;
 	struct port *port = &impl->out_ports[0];