diff --git a/lib/roken/roken-common.h b/lib/roken/roken-common.h
index a437d8a34..0eed27709 100644
--- a/lib/roken/roken-common.h
+++ b/lib/roken/roken-common.h
@@ -150,6 +150,11 @@
 
 #endif	/* !_WIN32 */
 
+/* Minimize conflict with WinNT.h */
+#ifdef SLIST_ENTRY
+#undef SLIST_ENTRY
+#endif
+
 #ifndef PATH_MAX
 #define PATH_MAX MAX_PATH
 #endif
@@ -221,6 +226,10 @@
 #define AI_NUMERICHOST	0x04
 #endif
 
+#ifndef AI_NUMERICSERV
+#define AI_NUMERICSERV  0x08
+#endif
+
 /* flags for getnameinfo() */
 
 #ifndef NI_DGRAM