diff --git a/channels/rdpecam/server/camera_device_enumerator_main.c b/channels/rdpecam/server/camera_device_enumerator_main.c
index 0b9eb5d20..516f958d5 100644
--- a/channels/rdpecam/server/camera_device_enumerator_main.c
+++ b/channels/rdpecam/server/camera_device_enumerator_main.c
@@ -20,9 +20,9 @@
 #include <freerdp/config.h>
 
 #include <freerdp/channels/log.h>
-#include <freerdp/server/camera-device-enumerator.h>
+#include <freerdp/server/rdpecam-enumerator.h>
 
-#define TAG CHANNELS_TAG("cam-dev-enum.server")
+#define TAG CHANNELS_TAG("rdpecam-enumerator.server")
 
 typedef enum
 {
diff --git a/channels/rdpecam/server/camera_device_main.c b/channels/rdpecam/server/camera_device_main.c
index 6449fab15..32d37da55 100644
--- a/channels/rdpecam/server/camera_device_main.c
+++ b/channels/rdpecam/server/camera_device_main.c
@@ -20,9 +20,9 @@
 #include <freerdp/config.h>
 
 #include <freerdp/channels/log.h>
-#include <freerdp/server/camera-device.h>
+#include <freerdp/server/rdpecam.h>
 
-#define TAG CHANNELS_TAG("camera-device.server")
+#define TAG CHANNELS_TAG("rdpecam.server")
 
 typedef enum
 {
diff --git a/channels/server/channels.c b/channels/server/channels.c
index cbd9ba2d2..be0f1e942 100644
--- a/channels/server/channels.c
+++ b/channels/server/channels.c
@@ -51,8 +51,11 @@
 #include <freerdp/server/telemetry.h>
 #include <freerdp/server/rdpgfx.h>
 #include <freerdp/server/disp.h>
-#include <freerdp/server/camera-device-enumerator.h>
-#include <freerdp/server/camera-device.h>
+
+#if defined(CHANNEL_RDPECAM_SERVER)
+#include <freerdp/server/rdpecam-enumerator.h>
+#include <freerdp/server/rdpecam.h>
+#endif
 
 #ifdef WITH_CHANNEL_GFXREDIR
 #include <freerdp/server/gfxredir.h>
@@ -79,8 +82,10 @@ void freerdp_channels_dummy(void)
 	TelemetryServerContext* telemetry;
 	RdpgfxServerContext* rdpgfx;
 	DispServerContext* disp;
+#if defined (CHANNEL_RDPECAM_SERVER)
 	CamDevEnumServerContext* camera_enumerator;
 	CameraDeviceServerContext* camera_device;
+#endif
 #ifdef WITH_CHANNEL_GFXREDIR
 	GfxRedirServerContext* gfxredir;
 #endif // WITH_CHANNEL_GFXREDIR
@@ -110,10 +115,14 @@ void freerdp_channels_dummy(void)
 	rdpgfx_server_context_free(rdpgfx);
 	disp = disp_server_context_new(NULL);
 	disp_server_context_free(disp);
+
+#if defined (CHANNEL_RDPECAM_SERVER)
 	camera_enumerator = cam_dev_enum_server_context_new(NULL);
 	cam_dev_enum_server_context_free(camera_enumerator);
 	camera_device = camera_device_server_context_new(NULL);
 	camera_device_server_context_free(camera_device);
+#endif
+
 #ifdef WITH_CHANNEL_GFXREDIR
 	gfxredir = gfxredir_server_context_new(NULL);
 	gfxredir_server_context_free(gfxredir);
diff --git a/include/config/config.h.in b/include/config/config.h.in
index ccf3bf261..ca61b599e 100644
--- a/include/config/config.h.in
+++ b/include/config/config.h.in
@@ -62,9 +62,6 @@
 #cmakedefine CHANNEL_AUDIN
 #cmakedefine CHANNEL_AUDIN_CLIENT
 #cmakedefine CHANNEL_AUDIN_SERVER
-#cmakedefine CHANNEL_CAMERA
-#cmakedefine CHANNEL_CAMERA_CLIENT
-#cmakedefine CHANNEL_CAMERA_SERVER
 #cmakedefine CHANNEL_CLIPRDR
 #cmakedefine CHANNEL_CLIPRDR_CLIENT
 #cmakedefine CHANNEL_CLIPRDR_SERVER
@@ -95,9 +92,6 @@
 #cmakedefine CHANNEL_PRINTER
 #cmakedefine CHANNEL_PRINTER_CLIENT
 #cmakedefine CHANNEL_PRINTER_SERVER
-#cmakedefine CHANNEL_RDPEI
-#cmakedefine CHANNEL_RDPEI_CLIENT
-#cmakedefine CHANNEL_RDPEI_SERVER
 #cmakedefine CHANNEL_RAIL
 #cmakedefine CHANNEL_RAIL_CLIENT
 #cmakedefine CHANNEL_RAIL_SERVER
@@ -107,6 +101,9 @@
 #cmakedefine CHANNEL_RDPDR
 #cmakedefine CHANNEL_RDPDR_CLIENT
 #cmakedefine CHANNEL_RDPDR_SERVER
+#cmakedefine CHANNEL_RDPECAM
+#cmakedefine CHANNEL_RDPECAM_CLIENT
+#cmakedefine CHANNEL_RDPECAM_SERVER
 #cmakedefine CHANNEL_RDPEI
 #cmakedefine CHANNEL_RDPEI_CLIENT
 #cmakedefine CHANNEL_RDPEI_SERVER
diff --git a/include/freerdp/server/camera-device-enumerator.h b/include/freerdp/server/rdpecam-enumerator.h
similarity index 100%
rename from include/freerdp/server/camera-device-enumerator.h
rename to include/freerdp/server/rdpecam-enumerator.h
diff --git a/include/freerdp/server/camera-device.h b/include/freerdp/server/rdpecam.h
similarity index 99%
rename from include/freerdp/server/camera-device.h
rename to include/freerdp/server/rdpecam.h
index 96e375ddf..67140ea97 100644
--- a/include/freerdp/server/camera-device.h
+++ b/include/freerdp/server/rdpecam.h
@@ -91,7 +91,7 @@ typedef UINT (*psCameraDeviceServerSetPropertyValueRequest)(
     CameraDeviceServerContext* context,
     const CAM_SET_PROPERTY_VALUE_REQUEST* setPropertyValueRequest);
 
-typedef struct camera_device_server_context
+struct camera_device_server_context
 {
 	HANDLE vcm;