diff --git a/sw/ground_segment/cockpit/Makefile b/sw/ground_segment/cockpit/Makefile
index 6c8a6d4305..84703ccffa 100644
--- a/sw/ground_segment/cockpit/Makefile
+++ b/sw/ground_segment/cockpit/Makefile
@@ -52,7 +52,7 @@ all : $(MAIN)
 
 opt : $(MAIN).opt
 
-$(MAIN) : $(CMO) $(XLIBPPRZCMA) $(LIBPPRZCMA)
+$(MAIN) : $(CMO)
 	@echo OL $@
 	$(Q)$(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) $(LIBS) $(LINKPKG) myGtkInit.cmo $(CMO) -o $@
 
diff --git a/sw/ground_segment/joystick/Makefile b/sw/ground_segment/joystick/Makefile
index aecc2cbd23..6cd13ca02d 100644
--- a/sw/ground_segment/joystick/Makefile
+++ b/sw/ground_segment/joystick/Makefile
@@ -36,7 +36,7 @@ else
   FPIC=
 endif
 
-OCAMLINCLUDES= -I $(LIBPPRZDIR) -I $(TOOLSDIR)
+OCAMLINCLUDES= -I $(TOOLSDIR)
 PKG = -package pprz,glibivy
 LINKPKG = $(PKG) -linkpkg -dllpath-pkg pprz
 
@@ -51,7 +51,7 @@ SDL_LDFLAGS = $(SDL_LDIRS) $(SDL_LIBS)
 # apparently on OSX `sdl-config --libs` also has -lSDLmain which we don't want
 ML_SDL_LFLAGS = $(foreach u,$(SDL_LDIRS),-ccopt $(u)) $(foreach u,$(SDL_LIBS),-cclib $(u)) libSDL.so
 ML_SDL_LFLAGS += -dllpath ${PAPARAZZI_SRC}/sw/ground_segment/joystick
-INCLUDES += -I `ocamlc -where`
+INCLUDES += -I $(shell ocamlc -where)
 
 
 all: test_stick input2ivy
@@ -60,12 +60,12 @@ test_stick: test_sdl_stick.o
 	@echo BUILD $@
 	$(Q)$(CC) -g -O2 -DSTICK_DBG $(GLIB_CFLAGS) -o $@ $^ sdl_stick.c $(GLIB_LDFLAGS) $(SDL_LDFLAGS)
 
-input2ivy: sdl_stick.so input2ivy.cmo $(LIBPPRZCMA)
+input2ivy: sdl_stick.so input2ivy.cmo
 	@echo OL $@
 	$(Q)$(OCAMLC) $(OCAMLINCLUDES) -o $@ $(LINKPKG) $(TOOLSDIR)/fp_proc.cmo $^ $(ML_SDL_LFLAGS)
 
 # dependency of input2ivy
-input2ivy: $(LIBPPRZCMA) $(TOOLSDIR)/fp_proc.cmo
+input2ivy: $(TOOLSDIR)/fp_proc.cmo
 
 sdl_stick.so : sdl_stick.o ml_sdl_stick.o
 	@echo BUILD $@
diff --git a/sw/ground_segment/tmtc/Makefile b/sw/ground_segment/tmtc/Makefile
index ea42850287..814ea6b996 100644
--- a/sw/ground_segment/tmtc/Makefile
+++ b/sw/ground_segment/tmtc/Makefile
@@ -60,58 +60,58 @@ $(VAR)/boa.conf :$(CONF)/boa.conf
 	sed 's|PAPARAZZI_HOME|$(PAPARAZZI_HOME)|' < $< > $@
 
 
-messages : messages.cmo $(XLIBPPRZCMA) $(LIBPPRZCMA)
+messages : messages.cmo
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $<
 
-settings : settings.cmo $(XLIBPPRZCMA) $(LIBPPRZCMA) ../cockpit/page_settings.cmo
+settings : settings.cmo ../cockpit/page_settings.cmo
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(XLINKPKG) gtkInit.cmo -I ../cockpit gtk_save_settings.cmo saveSettings.cmo page_settings.cmo $<
 
-server : $(SERVERCMO) $(LIBPPRZCMA)
+server : $(SERVERCMO)
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(SERVERCMO)
 
-server.opt :  $(SERVERCMX) $(LIBPPRZCMXA)
+server.opt :  $(SERVERCMX)
 	@echo OOL $@
 	$(Q)$(OCAMLOPT) $(INCLUDES) -o $@ -package glibivy,pprz -linkpkg $(SERVERCMX)
 
-link : link.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA)
+link : link.cmo $(LIBMULTIMONCMA)
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
 
 
-ivy_tcp_aircraft : ivy_tcp_aircraft.cmo  $(LIBMULTIMONCMA) $(LIBPPRZCMA)
+ivy_tcp_aircraft : ivy_tcp_aircraft.cmo  $(LIBMULTIMONCMA)
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
 
 
-ivy_tcp_controller : ivy_tcp_controller.cmo  $(LIBMULTIMONCMA) $(LIBPPRZCMA)
+ivy_tcp_controller : ivy_tcp_controller.cmo  $(LIBMULTIMONCMA)
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
 
 
-broadcaster : broadcaster.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA)
+broadcaster : broadcaster.cmo $(LIBMULTIMONCMA)
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
 
 
-ivy2udp : ivy2udp.cmo $(LIBPPRZCMA)
+ivy2udp : ivy2udp.cmo
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $<
 
 
-dia : dia.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA)
+dia : dia.cmo $(LIBMULTIMONCMA)
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
 
 
-diadec : diadec.cmo $(LIBMULTIMONCMA) $(LIBPPRZCMA)
+diadec : diadec.cmo $(LIBMULTIMONCMA)
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $(LIBMULTIMONDLL) $<
 
 
-150m : 150m.cmo $(LIBPPRZCMA)
+150m : 150m.cmo
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $<
 
diff --git a/sw/lib/ocaml/Makefile b/sw/lib/ocaml/Makefile
index aa60507db5..7594894388 100644
--- a/sw/lib/ocaml/Makefile
+++ b/sw/lib/ocaml/Makefile
@@ -95,14 +95,14 @@ xml_get.out : lib-pprz.cma xml_get.cmo | opt
 tests : lib-pprz.cma $(TESTS_CMO)
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ -package unix,str,xml-light,ivy -linkpkg -I . -dllpath . $^
 
-GTKCFLAGS := `pkg-config --cflags gtk+-2.0`
-
 %.o : %.c
 	@echo OC $<
 	$(Q)$(OCAMLC) $(FPIC) $(INCLUDES) -package $(PKGCOMMON) -c $<
 
 $(XCMO) $(XCMX) myGtkInit.cmo : PKGCOMMON=$(XPKGCOMMON)
 
+
+GTKCFLAGS := $(shell pkg-config --cflags gtk+-2.0)
 ml_gtk_drag.o : ml_gtk_drag.c
 	@echo OC $<
 	$(Q)$(OCAMLC) $(INCLUDES) -package $(PKGCOMMON) -c -ccopt "$(GTKCFLAGS)" $<
@@ -141,6 +141,8 @@ caml_from_c_example : cserial.o convert.o caml_from_c_example.o camltm.o
 	@echo OCY $<
 	$(Q)$(OCAMLYACC) $<
 
+# these deps *should* be generated correctly by ocamldep
+# somehow this is not the case for all
 expr_parser.cmo expr_parser.cmx : expr_parser.cmi expr_syntax.cmi
 expr_parser.cmi : expr_parser.ml expr_syntax.cmi
 expr_lexer.ml : expr_parser.ml
@@ -173,6 +175,7 @@ gtk_papget_led_editor.ml : widgets.glade
 	$(Q)$(Q)lablgladecc2 -root table_led_editor -hide-default $(TMPDIR)/$@_$< | grep -B 1000000 "  end" > $@
 	$(Q)rm $(TMPDIR)/$@_$<
 
+
 clean :
 	$(Q)rm -f *~ *.cm* *.out *.opt .depend *.a *.o *.so caml_from_c_example tests gtk_papget_*.ml expr_parser.ml expr_parser.mli expr_lexer.ml expr_lexer.mli
 
diff --git a/sw/logalizer/Makefile b/sw/logalizer/Makefile
index fc7d8291de..7eff8b6343 100644
--- a/sw/logalizer/Makefile
+++ b/sw/logalizer/Makefile
@@ -24,7 +24,7 @@
 Q=@
 
 include ../Makefile.ocaml
-INCLUDES= -I $(LIBPPRZDIR)
+INCLUDES=
 PKG = -package glibivy,pprz
 LINKPKG = $(PKG) -linkpkg -dllpath-pkg pprz
 XPKG = -package pprz.xlib
@@ -35,23 +35,23 @@ TMPDIR ?= /tmp
 
 all: play plotter plot sd2log plotprofile openlog2tlm
 
-play : $(LIBPPRZCMA) log_file.cmo play_core.cmo play.cmo
+play : log_file.cmo play_core.cmo play.cmo
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gtkInit.cmo $^
 
-play-nox : $(LIBPPRZCMA) play_core.cmo play-nox.cmo
+play-nox : play_core.cmo play-nox.cmo
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $^
 
-plotter : $(LIBPPRZCMA) $(XLIBPPRZCMA) plotter.cmo
+plotter : plotter.cmo
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(XLINKPKG) gtkInit.cmo $^
 
-plot : $(LIBPPRZCMA) $(XLIBPPRZCMA) log_file.cmo gtk_export.cmo export.cmo plot.cmo
+plot : log_file.cmo gtk_export.cmo export.cmo plot.cmo
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(XLINKPKG) gtkInit.cmo $^
 
-sd2log : $(LIBPPRZCMA) sd2log.cmo
+sd2log : sd2log.cmo
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $^
 
diff --git a/sw/simulator/Makefile b/sw/simulator/Makefile
index d2bea01533..d12a3eb96c 100644
--- a/sw/simulator/Makefile
+++ b/sw/simulator/Makefile
@@ -91,9 +91,6 @@ diffusion : stdlib.cmo diffusion.cmo
 	@echo OC $<
 	$(Q)$(OCAMLC) $(INCLUDES) -c $(PKG) $<
 
-# dependency on lib-pprz
-simhitl diffusion gaia:  $(LIBPPRZCMA)
-
 clean :
 	$(Q)rm -f *.cm* *~ *.out .depend *.o *.a *.so gaia simhitl diffusion
 
diff --git a/sw/supervision/Makefile b/sw/supervision/Makefile
index 9e244eb308..931ce1af44 100644
--- a/sw/supervision/Makefile
+++ b/sw/supervision/Makefile
@@ -62,7 +62,6 @@ gtk_process.ml : paparazzicenter.glade
 
 pc_common.cmo: gtk_process.cmo
 
-paparazzicenter : $(LIBPPRZCMA) $(XLIBPPRZCMA)
 paparazzicenter.cmo : gtk_pc.cmo
 
 clean:
diff --git a/sw/tools/Makefile b/sw/tools/Makefile
index 04a06a2595..843326d1e2 100644
--- a/sw/tools/Makefile
+++ b/sw/tools/Makefile
@@ -37,11 +37,11 @@ gen_flight_plan.out : $(FP_CMO)
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $^
 
-gen_srtm.out : gen_srtm.ml $(LIBPPRZCMA)
+gen_srtm.out : gen_srtm.ml
 	@echo OL $@
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) $<
 
-%.out : %.ml gen_common.cmo $(LIBPPRZCMA)
+%.out : %.ml gen_common.cmo
 	@echo OL $<
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ $(LINKPKG) gen_common.cmo $<
 
@@ -53,9 +53,6 @@ gen_srtm.out : gen_srtm.ml $(LIBPPRZCMA)
 	@echo OC $<
 	$(Q)$(OCAMLC) $(INCLUDES) $(PKG) -c $<
 
-# dependency on lib-pprz
-gen_flight_plan.out : $(LIBPPRZCMA)
-
 mergelogs: mergelogs.c
 	gcc mergelogs.c -o mergelogs