diff --git a/src/codegen/codegen_x86-64.c b/src/codegen/codegen_x86-64.c
index b295c251e..e3e6ced89 100644
--- a/src/codegen/codegen_x86-64.c
+++ b/src/codegen/codegen_x86-64.c
@@ -2,6 +2,7 @@
 
 #include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
 #define HAVE_STDARG_H
diff --git a/src/include/86box/86box.h b/src/include/86box/86box.h
index 5879a632e..3d9155066 100644
--- a/src/include/86box/86box.h
+++ b/src/include/86box/86box.h
@@ -45,6 +45,13 @@
 # define ENABLE_LOG_COMMANDS	1
 #endif
 
+#ifdef MIN
+#undef MIN
+#endif
+#ifdef MAX
+#undef MAX
+#endif
+
 #define MIN(a, b)	((a) < (b) ? (a) : (b))
 #define MAX(a, b)	((a) > (b) ? (a) : (b))
 #define ABS(x)		((x) > 0 ? (x) : -(x))