diff --git a/client/Makefile.am b/client/Makefile.am
index 85de987f..5166702f 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -31,7 +31,6 @@ snapper_SOURCES =					\
 	cmd-cleanup.cc					\
 	cmd-debug.cc					\
 	cleanup.cc		cleanup.h		\
-	locker.cc		locker.h		\
 	misc.cc			misc.h			\
 	MyFiles.cc		MyFiles.h		\
 	GlobalOptions.cc	GlobalOptions.h
@@ -51,7 +50,6 @@ libexec_PROGRAMS = systemd-helper
 systemd_helper_SOURCES =		\
 	systemd-helper.cc		\
 	cleanup.cc	cleanup.h	\
-	locker.cc	locker.h	\
 	misc.cc		misc.h
 
 systemd_helper_LDADD = 			\
diff --git a/client/cleanup.cc b/client/cleanup.cc
index 1842e33c..33151fd1 100644
--- a/client/cleanup.cc
+++ b/client/cleanup.cc
@@ -33,8 +33,8 @@
 #include "utils/Limit.h"
 #include "utils/equal-date.h"
 #include "utils/HumanString.h"
+#include "proxy/locker.h"
 #include "cleanup.h"
-#include "locker.h"
 
 
 using namespace std;
diff --git a/client/cmd-list.cc b/client/cmd-list.cc
index 550ca3a4..70805bd8 100644
--- a/client/cmd-list.cc
+++ b/client/cmd-list.cc
@@ -32,8 +32,8 @@
 #include "utils/text.h"
 #include "utils/help.h"
 #include "proxy/proxy.h"
+#include "proxy/locker.h"
 #include "GlobalOptions.h"
-#include "locker.h"
 #include "misc.h"
 #include "utils/TableFormatter.h"
 #include "utils/CsvFormatter.h"
diff --git a/client/proxy/.gitignore b/client/proxy/.gitignore
new file mode 100644
index 00000000..66a3f3fe
--- /dev/null
+++ b/client/proxy/.gitignore
@@ -0,0 +1,2 @@
+*.lo
+*.la
diff --git a/client/proxy/Makefile.am b/client/proxy/Makefile.am
index 785b09de..2a6e8bfd 100644
--- a/client/proxy/Makefile.am
+++ b/client/proxy/Makefile.am
@@ -18,4 +18,5 @@ libclient_la_LIBADD = 			\
 libproxy_la_SOURCES =			\
 	proxy.cc	proxy.h		\
 	proxy-dbus.cc	proxy-dbus.h	\
-	proxy-lib.cc	proxy-lib.h
+	proxy-lib.cc	proxy-lib.h	\
+	locker.cc	locker.h
diff --git a/client/locker.cc b/client/proxy/locker.cc
similarity index 100%
rename from client/locker.cc
rename to client/proxy/locker.cc
diff --git a/client/locker.h b/client/proxy/locker.h
similarity index 97%
rename from client/locker.h
rename to client/proxy/locker.h
index 9d53516e..41d30ae1 100644
--- a/client/locker.h
+++ b/client/proxy/locker.h
@@ -20,7 +20,7 @@
  */
 
 
-#include "proxy/proxy.h"
+#include "proxy.h"
 
 
 namespace snapper