diff --git a/examples/Makefile b/examples/Makefile
index f52f10cb17155211004fd578195cd75c74eedb1a..fc39c55448fc0246f0ddbba0c05e24c7bc2e0b1d 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -7,12 +7,18 @@ all:
 	echo More to be done...
 	$(MAKE) -C twoway all
 
+UNAME_S=$(shell uname -s)
+
 .PHONY: test
 test:
 	echo More to be done...
+ifeq ($(UNAME_S),Darwin)
+	$(MAKE) -C user_types all 
+else	
 	cd simple ; sh compile.sh && sh run.sh
 	$(MAKE) -C  wiki_example test
 	$(MAKE) -C user_types test 
+endif	
 	$(MAKE) -C duck_typing test
 	$(MAKE) -C twoway test 
 
diff --git a/examples/twoway/Makefile b/examples/twoway/Makefile
index 5a686f1eb1e9d566145e83ff1180f00fb915f46d..d4e5c7e1a29d0b4fc3028b4af1f768ac5fe242bb 100644
--- a/examples/twoway/Makefile
+++ b/examples/twoway/Makefile
@@ -2,7 +2,8 @@ TARGETS=client server
 LABCOMM_JAR=../../compiler/labcomm_compiler.jar
 LABCOMM=java -jar $(LABCOMM_JAR) 
 
-CFLAGS=-O3 -g -Wall -Werror -I../../lib/c/2014 -I. -Wno-unused-function
+include ../../lib/c/os_compat.mk
+CFLAGS+=-I../../lib/c/2014 -I.
 
 all: $(TARGETS:%=gen/%)
 
diff --git a/examples/twoway/client.c b/examples/twoway/client.c
index be82e9a8834e45e43eca6964b567d0ac1ef7cb61..0166a3553616ca1858aafebc8a2adb3935f332f0 100644
--- a/examples/twoway/client.c
+++ b/examples/twoway/client.c
@@ -21,7 +21,12 @@
 
 #include <errno.h>
 #include <arpa/inet.h>
+#ifndef LABCOMM_OS_DARWIN
 #include <linux/tcp.h>
+#else
+#include <netinet/in.h>
+#include <netinet/tcp.h> 
+#endif
 #include <netdb.h>
 #include <pthread.h>
 #include <stdio.h>
diff --git a/examples/twoway/server.c b/examples/twoway/server.c
index 3a34efa464ab06c19b312a0434d70ea9f10c413a..e6eaac0ad7b2b254c65ec3ab46628ead6e0dd621 100644
--- a/examples/twoway/server.c
+++ b/examples/twoway/server.c
@@ -20,7 +20,12 @@
 */
 
 #include <arpa/inet.h>
+#ifndef LABCOMM_OS_DARWIN
 #include <linux/tcp.h>
+#else
+#include <netinet/in.h>
+#include <netinet/tcp.h> 
+#endif
 #include <errno.h>
 #include <pthread.h>
 #include <stdlib.h>
diff --git a/lib/c/2006/labcomm2006_compat_arm_cortexm3.h b/lib/c/2006/labcomm_compat_arm_cortexm3.h
similarity index 100%
rename from lib/c/2006/labcomm2006_compat_arm_cortexm3.h
rename to lib/c/2006/labcomm_compat_arm_cortexm3.h
diff --git a/lib/c/2006/labcomm2006_compat_osx.h b/lib/c/2006/labcomm_compat_osx.h
similarity index 100%
rename from lib/c/2006/labcomm2006_compat_osx.h
rename to lib/c/2006/labcomm_compat_osx.h
diff --git a/lib/c/2006/labcomm2006_compat_vxworks.h b/lib/c/2006/labcomm_compat_vxworks.h
similarity index 100%
rename from lib/c/2006/labcomm2006_compat_vxworks.h
rename to lib/c/2006/labcomm_compat_vxworks.h
diff --git a/lib/c/Makefile b/lib/c/Makefile
index 6067a26b848e7c4a8bdff3283649e16e6ed2ccae..a85a91cd77acbdaf3e09890d4b4f3b912fd795a3 100644
--- a/lib/c/Makefile
+++ b/lib/c/Makefile
@@ -4,3 +4,9 @@ all:
 
 %: 
 	for v in $(VERSIONS) ; do $(MAKE) -C $${v} $@ || exit 1 ; done
+
+
+.PHONY: distclean
+distclean: 
+	rm *.o *.so *.so.1 *.a
+
diff --git a/lib/c/os_compat.mk b/lib/c/os_compat.mk
index 23366e374af55f6cb6ed505d342a8579c8322c4b..23b66f2faa2e425e1fb0be3eb0f8772cdd972d60 100644
--- a/lib/c/os_compat.mk
+++ b/lib/c/os_compat.mk
@@ -14,6 +14,7 @@ else ifeq ($(UNAME_S),Darwin)
   LD=$(CROSS_COMPILE)ld
   CFLAGS=-g -Wall -Werror -O3  -I. -Itest \
 	 -DLABCOMM_COMPAT=\"labcomm_compat_osx.h\" \
+	 -DLABCOMM_OS_DARWIN=1\
 	 -Wno-tautological-compare -Wno-unused-function
   LDFLAGS=-L..
   LDLIBS=-llabcomm$(LIBVERSION)
diff --git a/test/Makefile b/test/Makefile
index 0293534990f55101f9f91b977be7d8b59989ca69..106810bafe9053807a2f59f8a46212d13853afad 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,7 +2,7 @@ TESTS=basic simple nested ref
 LABCOMM_JAR=../compiler/labcomm_compiler.jar
 LABCOMM=java -jar $(LABCOMM_JAR)
 
-CFLAGS=-O3 -g -Wall -Werror -Wno-unused-function
+include ../lib/c/os_compat.mk
 
 all: