diff --git a/daemon/cleanups.h b/daemon/cleanups.h
index 1a56ead8d..6746e2744 100644
--- a/daemon/cleanups.h
+++ b/daemon/cleanups.h
@@ -19,7 +19,9 @@
 #ifndef GUESTFSD_CLEANUPS_H
 #define GUESTFSD_CLEANUPS_H
 
-/* Used by the CLEANUP_* macros. */
+/* These functions are used internally by the CLEANUP_* macros.
+ * Don't call them directly.
+ */
 extern void cleanup_free (void *ptr);
 extern void cleanup_free_string_list (void *ptr);
 extern void cleanup_unlink_free (void *ptr);
diff --git a/daemon/command.c b/daemon/command.c
index 3e757aa31..73fce564d 100644
--- a/daemon/command.c
+++ b/daemon/command.c
@@ -31,6 +31,7 @@
 
 #include "ignore-value.h"
 
+#include "guestfs-internal-all.h"
 #include "command.h"
 #include "cleanups.h"
 
@@ -39,10 +40,6 @@ extern int verbose;
 extern const char *sysroot;
 extern size_t sysroot_len;
 
-#ifndef MAX
-# define MAX(a,b) ((a)>(b)?(a):(b))
-#endif
-
 /* For improved readability dealing with pipe arrays */
 #define PIPE_READ 0
 #define PIPE_WRITE 1