diff --git a/src/pipewire/command.c b/src/daemon/command.c
similarity index 99%
rename from src/pipewire/command.c
rename to src/daemon/command.c
index ae17932be..e9fb7b692 100644
--- a/src/pipewire/command.c
+++ b/src/daemon/command.c
@@ -31,9 +31,9 @@
 
 #include <pipewire/utils.h>
 #include <pipewire/module.h>
+#include <pipewire/private.h>
 
 #include "command.h"
-#include "private.h"
 
 /** \cond */
 
diff --git a/src/pipewire/command.h b/src/daemon/command.h
similarity index 100%
rename from src/pipewire/command.h
rename to src/daemon/command.h
diff --git a/src/daemon/meson.build b/src/daemon/meson.build
index b47cd3fea..17155952c 100644
--- a/src/daemon/meson.build
+++ b/src/daemon/meson.build
@@ -1,9 +1,11 @@
 pipewire_daemon_sources = [
-  'main.c',
+  'command.c',
   'daemon-config.c',
+  'main.c',
 ]
 
 pipewire_daemon_headers = [
+  'command.h',
   'daemon-config.h',
 ]
 
diff --git a/src/pipewire/meson.build b/src/pipewire/meson.build
index e1ae48f86..23a20d46d 100644
--- a/src/pipewire/meson.build
+++ b/src/pipewire/meson.build
@@ -1,7 +1,6 @@
 pipewire_headers = [
   'array.h',
   'client.h',
-  'command.h',
   'control.h',
   'core.h',
   'data-loop.h',
@@ -36,7 +35,6 @@ pipewire_headers = [
 
 pipewire_sources = [
   'client.c',
-  'command.c',
   'control.c',
   'core.c',
   'data-loop.c',