diff -urN mutt-1.6.0.orig/getdomain.c mutt-1.6.0/getdomain.c
--- mutt-1.6.0.orig/getdomain.c	2016-04-02 20:12:22.000000000 +0200
+++ mutt-1.6.0/getdomain.c	2016-04-04 23:05:03.307693021 +0200
@@ -26,6 +26,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+#undef M_CMD
+#undef M_READ
+
 #include "mutt.h"