diff --git a/include/ntfs/security.h b/include/ntfs/security.h
index e477eb12..608429e0 100644
--- a/include/ntfs/security.h
+++ b/include/ntfs/security.h
@@ -50,6 +50,6 @@ static __inline__ BOOL ntfs_sid_is_valid(const SID *sid)
 extern int ntfs_sid_to_mbs_size(const SID *sid);
 extern char *ntfs_sid_to_mbs(const SID *sid, char *sid_str,
 		size_t sid_str_size);
-extern GUID *generate_guid(GUID *guid);
+extern GUID *ntfs_generate_guid(GUID *guid);
 
 #endif /* defined _NTFS_SECURITY_H */
diff --git a/libntfs/security.c b/libntfs/security.c
index 75aef280..5d1bb11a 100644
--- a/libntfs/security.c
+++ b/libntfs/security.c
@@ -251,14 +251,14 @@ err_out:
 }
 
 /**
- * generate_guid - generatates a random current guid.
+ * ntfs_generate_guid - generatates a random current guid.
  * @guid:	a pointer to a GUID struct to hold the generated guid.
  *
  * perhaps not a very good random number generator though...
  *
  * Returns: The same pointer it was given as a parameter (guid).
  */
-GUID *generate_guid(GUID *guid)
+GUID *ntfs_generate_guid(GUID *guid)
 {
 
 	int i;
diff --git a/ntfsprogs/mkntfs.c b/ntfsprogs/mkntfs.c
index 4bc80c0c..9e3e3848 100644
--- a/ntfsprogs/mkntfs.c
+++ b/ntfsprogs/mkntfs.c
@@ -4202,7 +4202,7 @@ static void create_file_volume(MFT_RECORD *m, MFT_REF root_ref, VOLUME_FLAGS fl)
 	}
 	if (!err && vol->major_ver>=3) {
 		volume_obj_id=(OBJECT_ID_ATTR*)calloc(1,0x10);
-		volume_obj_id->object_id = *generate_guid(&volume_obj_id->object_id);
+		volume_obj_id->object_id = *ntfs_generate_guid(&volume_obj_id->object_id);
 		err = add_attr_object_id(m, volume_obj_id, 0x10);
 	}
 	if (!err)