diff --git a/conf/autopilot/subsystems/fixedwing/autopilot.makefile b/conf/autopilot/subsystems/fixedwing/autopilot.makefile
index 25687b7151..feb2496d0b 100644
--- a/conf/autopilot/subsystems/fixedwing/autopilot.makefile
+++ b/conf/autopilot/subsystems/fixedwing/autopilot.makefile
@@ -178,7 +178,7 @@ ap_srcs 		+= $(SRC_FIXEDWING)/estimator.c
 
 UNAME = $(shell uname -s)
 ifeq ("$(UNAME)","Darwin")
-  sim.CFLAGS += -I/opt/local/include/
+  sim.CFLAGS += -I/opt/paparazzi/include/ -I/opt/local/include/
 endif
 
 sim.CFLAGS              += $(CPPFLAGS)
diff --git a/sw/ground_segment/lpc21iap/Makefile b/sw/ground_segment/lpc21iap/Makefile
index e3fab50201..dc4a954a37 100644
--- a/sw/ground_segment/lpc21iap/Makefile
+++ b/sw/ground_segment/lpc21iap/Makefile
@@ -27,8 +27,8 @@ endif
 
 UNAME = $(shell uname -s)
 ifeq ("$(UNAME)","Darwin")
-  INCLUDES=-I/opt/local/include/
-  LIBRARYS=-L/opt/local/lib	
+  LIBRARYS = -L /opt/paparazzi/lib -L /opt/local/lib
+  INCLUDES = -I /opt/paparazzi/include -I /opt/local/include/
 endif
 
 
diff --git a/sw/ground_segment/misc/Makefile b/sw/ground_segment/misc/Makefile
index d7cf0118fb..7870fe7e62 100644
--- a/sw/ground_segment/misc/Makefile
+++ b/sw/ground_segment/misc/Makefile
@@ -1,7 +1,8 @@
 UNAME = $(shell uname -s)
 
 ifeq ("$(UNAME)","Darwin")
-  LIBRARYS = -L/opt/local/lib
+  LIBRARYS = -L /opt/paparazzi/lib -L /opt/local/lib
+  INCLUDES = -I /opt/paparazzi/include -I /opt/local/include/
 else
   LIBRARYS = -s
 endif
@@ -19,4 +20,4 @@ kestrel2ivy: kestrel2ivy.o
 	g++ -o kestrel2ivy kestrel2ivy.o $(LIBRARYS) -livy
 
 %.o : %.c
-	gcc -c -O2 -Wall -I /opt/local/include/  $<
+	gcc -c -O2 -Wall $(INCLUDES) $<
diff --git a/sw/lib/ocaml/ivy/Makefile b/sw/lib/ocaml/ivy/Makefile
index 24613416c7..574935c6d6 100644
--- a/sw/lib/ocaml/ivy/Makefile
+++ b/sw/lib/ocaml/ivy/Makefile
@@ -49,8 +49,11 @@ TKIVYCMX= $(TKIVY:.ml=.cmx)
 
 UNAME = $(shell uname -s)
 
+UNAME = $(shell uname -s)
+
 ifeq ("$(UNAME)","Darwin")
-  LIBRARYS = -L/opt/local/lib
+  LIBRARYS = -L /opt/paparazzi/lib -L /opt/local/lib
+  INCLUDES = -I /opt/paparazzi/include -I /opt/local/include/
 endif
 
 LIBS = ivy-ocaml.cma ivy-ocaml.cmxa glibivy-ocaml.cma glibivy-ocaml.cmxa
@@ -102,7 +105,7 @@ tkivy-ocaml.cmxa : $(TKIVYCMX) civy.o ctkivy.o
 	$(OCAMLC) $(OCAMLFLAGS) $(INCLUDES) -c $<
 .c.o :
 
-	$(CC) -Wall -c $(FPIC) -I /opt/local/include/  $(OCAMLINC) $(GLIBINC) $<
+	$(CC) -Wall -c $(FPIC) $(INCLUDES) $(OCAMLINC) $(GLIBINC) $<
 .mli.cmi :
 	$(OCAMLMLI) $(OCAMLFLAGS) -c $<
 .ml.cmx :