diff --git a/libdaemon/client/config-util.h b/libdaemon/client/config-util.h
index 64cce8bbf..38f36af31 100644
--- a/libdaemon/client/config-util.h
+++ b/libdaemon/client/config-util.h
@@ -26,7 +26,7 @@ int buffer_append_f(struct buffer *buf, ...);
 int buffer_append(struct buffer *buf, const char *string);
 void buffer_init(struct buffer *buf);
 void buffer_destroy(struct buffer *buf);
-int buffer_realloc(struct buffer *buf, int required);
+int buffer_realloc(struct buffer *buf, int needed);
 
 int buffer_line(const char *line, void *baton);
 
diff --git a/libdaemon/client/daemon-client.h b/libdaemon/client/daemon-client.h
index 173ea89ac..5235beaea 100644
--- a/libdaemon/client/daemon-client.h
+++ b/libdaemon/client/daemon-client.h
@@ -78,7 +78,7 @@ daemon_handle daemon_open(daemon_info i);
  * be ignored even if non-NULL). If the buffer is NULL, the cft is required to
  * be a valid pointer, and is used to build up the request.
  */
-daemon_reply daemon_send(daemon_handle h, daemon_request r);
+daemon_reply daemon_send(daemon_handle h, daemon_request rq);
 
 /*
  * A simple interface to daemon_send. This function just takes the command id