diff --git a/src/if.c b/src/if.c
index 3654e93..adda71d 100644
--- a/src/if.c
+++ b/src/if.c
@@ -7,11 +7,13 @@
  *       All rights reserved
  *
  * Created:       Tue Dec  4 14:50:34 2012 mstenber
- * Last modified: Wed Dec  5 09:50:59 2012 mstenber
- * Edit time:     22 min
+ * Last modified: Wed Dec  5 18:48:55 2012 mstenber
+ * Edit time:     23 min
  *
  */
 
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <net/if.h>
 
 #include "if.h"
diff --git a/src/makefile b/src/makefile
index 3b1eada..bdcc07a 100644
--- a/src/makefile
+++ b/src/makefile
@@ -29,7 +29,8 @@ DEBUG?=NODEBUG
 # LUAINC_macosx:
 # /opt/local/include
 LUAINC_macosx_base?=/opt/local/include
-LUAINC_macosx?=$(LUAINC_macosx_base)/lua$(LUAV)
+#LUAINC_macosx?=$(LUAINC_macosx_base)/lua$(LUAV)
+LUAINC_macosx?=$(LUAINC_macosx_base)
 # FIXME default should this default to fink or to macports?
 # What happens when more than one Lua version is installed?
 LUAPREFIX_macosx?=/opt/local/
diff --git a/src/options.c b/src/options.c
index d3c347a..11411a6 100644
--- a/src/options.c
+++ b/src/options.c
@@ -10,6 +10,22 @@
 #include "options.h"
 #include "inet.h"
 
+/* Some platforms use IPV6_JOIN_GROUP instead if
+ * IPV6_ADD_MEMBERSHIP. The semantics are same, though. */
+#ifndef IPV6_ADD_MEMBERSHIP
+#ifdef IPV6_JOIN_GROUP
+#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
+#endif /* IPV6_JOIN_GROUP */
+#endif /* !IPV6_ADD_MEMBERSHIP */
+
+/* Same with IPV6_DROP_MEMBERSHIP / IPV6_LEAVE_GROUP. */
+#ifndef IPV6_DROP_MEMBERSHIP
+#ifdef IPV6_LEAVE_GROUP
+#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
+#endif /* IPV6_LEAVE_GROUP */
+#endif /* !IPV6_DROP_MEMBERSHIP */
+
+
 /*=========================================================================*\
 * Internal functions prototypes
 \*=========================================================================*/