diff --git a/sw/ground_segment/cockpit/Makefile b/sw/ground_segment/cockpit/Makefile
index a4a47cb12c..8cd1b16c5f 100644
--- a/sw/ground_segment/cockpit/Makefile
+++ b/sw/ground_segment/cockpit/Makefile
@@ -27,8 +27,10 @@ OCAMLC=ocamlc
 OCAMLCFLAGS=-thread
 OCAMLOPT=ocamlopt
 OCAMLOPTFLAGS=-thread
-INCLUDES=-I +lablgtk2 -I ../../lib/ocaml -I +xml-light -I +netsys -I +netstring -I +pcre
-LIBS=pcre.cma netsys.cma netstring.cma glibivy-ocaml.cma lablgtk.cma lablglade.cma lib-pprz.cma lablgnomecanvas.cma xlib-pprz.cma
+OCAMLNETINCLUDES=$(shell ocamlfind query -r -i-format netstring)
+OCAMLNETCMA=$(shell ocamlfind query -r -a-format -predicates byte netstring)
+INCLUDES=-I +lablgtk2 -I ../../lib/ocaml -I +xml-light $(OCAMLNETINCLUDES)
+LIBS=$(OCAMLNETCMA) glibivy-ocaml.cma lablgtk.cma lablglade.cma lib-pprz.cma lablgnomecanvas.cma xlib-pprz.cma
 CMXA=$(LIBS:.cma=.cmxa)
 
 ML= gtk_setting_time.ml gtk_strip.ml horizon.ml strip.ml gtk_save_settings.ml saveSettings.ml pages.ml speech.ml plugin.ml sectors.ml map2d.ml editFP.ml live.ml particules.ml gcs.ml
diff --git a/sw/ground_segment/tmtc/Makefile b/sw/ground_segment/tmtc/Makefile
index ac51cad077..579d7dffb0 100644
--- a/sw/ground_segment/tmtc/Makefile
+++ b/sw/ground_segment/tmtc/Makefile
@@ -35,7 +35,9 @@ clean:
 OCAMLC = ocamlc
 OCAMLOPT = ocamlopt
 OCAMLLIB = ../../lib/ocaml
-INCLUDES= -I $(OCAMLLIB) -I ../multimon -I +lablgtk2 -I +xml-light -I +netsys -I +netstring -I +pcre
+OCAMLNETINCLUDES=$(shell ocamlfind query -r -i-format netstring)
+OCAMLNETCMA=$(shell ocamlfind query -r -a-format -predicates byte netstring)
+INCLUDES= -I $(OCAMLLIB) -I ../multimon -I +lablgtk2 -I +xml-light $(OCAMLNETINCLUDES)
 LIBPPRZCMA=$(OCAMLLIB)/lib-pprz.cma
 
 SERVERCMO = aircraft.cmo wind.cmo airprox.cmo kml.cmo server.cmo
@@ -54,7 +56,7 @@ messages : messages.cmo ../../lib/ocaml/xlib-pprz.cma ../../lib/ocaml/lib-pprz.c
 
 settings : settings.cmo ../../lib/ocaml/xlib-pprz.cma ../../lib/ocaml/lib-pprz.cma
 	@echo OL $@
-	$(Q)$(OCAMLC) -custom $(INCLUDES) -I ../cockpit -o $@ unix.cma str.cma xml-light.cma lablgtk.cma lablglade.cma pcre.cma netsys.cma netstring.cma glibivy-ocaml.cma lib-pprz.cma gtkInit.cmo gtk_save_settings.cmo saveSettings.cmo pages.cmo $<
+	$(Q)$(OCAMLC) -custom $(INCLUDES) -I ../cockpit -o $@ unix.cma str.cma xml-light.cma lablgtk.cma lablglade.cma $(OCAMLNETCMA) glibivy-ocaml.cma lib-pprz.cma gtkInit.cmo gtk_save_settings.cmo saveSettings.cmo pages.cmo $<
 
 
 server : $(SERVERCMO) ../../lib/ocaml/lib-pprz.cma
diff --git a/sw/tools/Makefile b/sw/tools/Makefile
index ef1b56a011..b59ab254ed 100644
--- a/sw/tools/Makefile
+++ b/sw/tools/Makefile
@@ -25,6 +25,8 @@ Q=@
 OCAML=ocaml
 OCAMLC=ocamlc
 INCLUDES=-I ../lib/ocaml -I +xml-light
+OCAMLNETINCLUDES=$(shell ocamlfind query -r -i-format netstring)
+OCAMLNETCMA=$(shell ocamlfind query -r -a-format -predicates byte netstring)
 OCAMLLEX=ocamllex
 OCAMLYACC=ocamlyacc
 
@@ -49,7 +51,7 @@ fp_syntax.cmo : fp_syntax.cmi
 	@echo OC $<
 	$(Q)$(OCAMLC) $(INCLUDES) -o $@ unix.cma str.cma ivy-ocaml.cma xml-light.cma lib-pprz.cma $<
 	@cat ../../pprz_src_test.sh > $@
-	@echo '$(OCAML) -I +xml-light -I +pcre -I +netsys -I +netstring -I $$PAPARAZZI_SRC/sw/lib/ocaml unix.cma str.cma ivy-ocaml.cma xml-light.cma pcre.cma netsys.cma netstring.cma lib-pprz.cma $$PAPARAZZI_BIN/$< $$*' >> $@
+	@echo '$(OCAML) -I +xml-light $(OCAMLNETINCLUDES) -I $$PAPARAZZI_SRC/sw/lib/ocaml unix.cma str.cma ivy-ocaml.cma xml-light.cma $(OCAMLNETCMA) lib-pprz.cma $$PAPARAZZI_BIN/$< $$*' >> $@
 	@chmod a+x $@
 
 %.cmo : %.ml ../lib/ocaml/lib-pprz.cma