diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index f9624d6ca93..0f0e90f0abb 100644
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -203,6 +203,11 @@ enum case_handling {CASE_LOWER,CASE_UPPER};
 #define PRINT_MAX_JOBID 10000
 #endif
 
+/* the default guest account - allow override via CFLAGS */
+#ifndef GUEST_ACCOUNT
+#define GUEST_ACCOUNT "nobody"
+#endif
+
 #define LOADPARM_EXTRA_LOCALS						\
 	bool valid;						        \
 	int usershare;							\
diff --git a/source3/include/local.h b/source3/include/local.h
index a87ab8f100d..c494d90eec0 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -80,11 +80,6 @@
    NT file manager window? */
 #define FSTYPE_STRING "NTFS"
 
-/* the default guest account - normally set in the Makefile or smb.conf */
-#ifndef GUEST_ACCOUNT
-#define GUEST_ACCOUNT "nobody"
-#endif
-
 /* user to test password server with as invalid in security=server mode. */
 #ifndef INVALID_USER_PREFIX
 #define INVALID_USER_PREFIX "sambatest"