diff --git a/src/Makefile.am b/src/Makefile.am
index 38b269758c..f6690b6cd7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2069,7 +2069,6 @@ libvirt_setuid_rpc_client_la_SOURCES = 		\
 		util/virprocess.c		\
 		util/virrandom.c		\
 		util/virsocketaddr.c		\
-		util/virstoragefile.c		\
 		util/virstring.c		\
 		util/virtime.c			\
 		util/virthread.c		\
diff --git a/src/util/virfile.c b/src/util/virfile.c
index fcc65b1b45..a28cbf1441 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -540,7 +540,8 @@ int virFileUpdatePerm(const char *path,
 }
 
 
-#if defined(__linux__) && HAVE_DECL_LO_FLAGS_AUTOCLEAR
+#if defined(__linux__) && HAVE_DECL_LO_FLAGS_AUTOCLEAR && \
+    !defined(LIBVIRT_SETUID_RPC_CLIENT)
 
 # if HAVE_DECL_LOOP_CTL_GET_FREE