diff --git a/src/nvme/ioctl.c b/src/nvme/ioctl.c
index 3ae6ecd87..29a2f2f57 100644
--- a/src/nvme/ioctl.c
+++ b/src/nvme/ioctl.c
@@ -503,7 +503,7 @@ static int read_ana_chunk(int fd, enum nvme_log_ana_lsp lsp, bool rae,
 	}
 
 	while (*read < to_read) {
-		__u32 len = min(log_end - *read, NVME_LOG_PAGE_PDU_SIZE);
+		__u32 len = nvme_min(log_end - *read, NVME_LOG_PAGE_PDU_SIZE);
 		int ret;
 
 		ret = nvme_get_log_ana(fd, lsp, rae, *read - log, len, *read);
diff --git a/src/nvme/mi.c b/src/nvme/mi.c
index e9f39a84e..dedd17bec 100644
--- a/src/nvme/mi.c
+++ b/src/nvme/mi.c
@@ -1021,7 +1021,7 @@ static int read_ana_chunk(nvme_mi_ctrl_t ctrl, enum nvme_log_ana_lsp lsp, bool r
 	}
 
 	while (*read < to_read) {
-		__u32 len = min(log_end - *read, NVME_LOG_PAGE_PDU_SIZE);
+		__u32 len = nvme_min(log_end - *read, NVME_LOG_PAGE_PDU_SIZE);
 		int ret;
 
 		ret = nvme_mi_admin_get_log_ana(ctrl, lsp, rae,
diff --git a/src/nvme/util.c b/src/nvme/util.c
index 1af358a30..7139126c6 100644
--- a/src/nvme/util.c
+++ b/src/nvme/util.c
@@ -1151,7 +1151,7 @@ void *__nvme_realloc(void *p, size_t len)
 	void *result = __nvme_alloc(len);
 
 	if (p && result) {
-		memcpy(result, p, min(old_len, len));
+		memcpy(result, p, nvme_min(old_len, len));
 		free(p);
 	}
 
diff --git a/src/nvme/util.h b/src/nvme/util.h
index 364ca0f2b..d4fd72bc4 100644
--- a/src/nvme/util.h
+++ b/src/nvme/util.h
@@ -560,7 +560,7 @@ char *kv_keymatch(const char *kv, const char *key);
  */
 char *startswith(const char *s, const char *prefix);
 
-#define min(x, y) ((x) > (y) ? (y) : (x))
+#define nvme_min(x, y) ((x) > (y) ? (y) : (x))
 
 #define __round_mask(val, mult) ((__typeof__(val))((mult)-1))
 
diff --git a/test/cpp.cc b/test/cpp.cc
index 3d0a7d250..bcc4b911d 100644
--- a/test/cpp.cc
+++ b/test/cpp.cc
@@ -6,9 +6,20 @@
  * Authors: Keith Busch <keith.busch@wdc.com>
  */
 
+#include <algorithm>
 #include <iostream>
 #include <libnvme.h>
 
+static int min_compile_test()
+{
+	return std::min(1, 2);
+}
+
+static int max_compile_test()
+{
+	return std::max(1, 2);
+}
+
 int main()
 {
 	nvme_root_t r;
@@ -62,5 +73,8 @@ int main()
 	std::cout << "\n";
 	nvme_free_tree(r);
 
+	min_compile_test();
+	max_compile_test();
+
 	return 0;
 }