diff --git a/infrastructure-centred/libowlps-client/Makefile b/infrastructure-centred/libowlps-client/Makefile
index 57526fc..4bdbc90 100644
--- a/infrastructure-centred/libowlps-client/Makefile
+++ b/infrastructure-centred/libowlps-client/Makefile
@@ -21,7 +21,8 @@ HEADER=owlps-client.h
 OBJS=$(LIB_CIBLE).o
 
 # Flags
-CFLAGS=-O2 -Wall -Wextra -Wstrict-prototypes -O -I.
+LIBOWLPS_DIR = ../../libowlps
+CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I$(LIBOWLPS_DIR)
 DEPFLAGS=-MMD
 XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
 PICFLAG=-fPIC
diff --git a/infrastructure-centred/libowlps-client/Makefile_atheros b/infrastructure-centred/libowlps-client/Makefile_atheros
index 6184c9e..00515aa 100644
--- a/infrastructure-centred/libowlps-client/Makefile_atheros
+++ b/infrastructure-centred/libowlps-client/Makefile_atheros
@@ -21,7 +21,8 @@ HEADER=owlps-client.h
 OBJS=$(LIB_CIBLE).o
 
 # Flags
-CFLAGS=-O2 -Wall -Wextra -Wstrict-prototypes -O -I.
+LIBOWLPS_DIR = ../../libowlps
+CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I$(LIBOWLPS_DIR)
 DEPFLAGS=-MMD
 XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
 PICFLAG=-fPIC
diff --git a/infrastructure-centred/libowlps-client/owlps-client.h b/infrastructure-centred/libowlps-client/owlps-client.h
index b2b9673..1cc6c20 100644
--- a/infrastructure-centred/libowlps-client/owlps-client.h
+++ b/infrastructure-centred/libowlps-client/owlps-client.h
@@ -6,7 +6,7 @@
 #ifndef _LIBOWLPS_CLIENT_
 #define _LIBOWLPS_CLIENT_
 
-#include "../../libowlps/owlps.h"
+#include <owlps.h>
 
 /* Error codes */
 #define ERR_CREATING_SOCKET 151 // Error when creating output socket
diff --git a/infrastructure-centred/owlps-aggregator/Makefile b/infrastructure-centred/owlps-aggregator/Makefile
index 3d7157d..69c8807 100644
--- a/infrastructure-centred/owlps-aggregator/Makefile
+++ b/infrastructure-centred/owlps-aggregator/Makefile
@@ -20,12 +20,13 @@ TARGET=owlps-aggregatord
 HEADER=owlps-aggregator.h
 
 # Flags
-CFLAGS=-O2 -Wall -Wextra -Wstrict-prototypes -O -I.
+LIBOWLPS_DIR = ../../libowlps
+CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I$(LIBOWLPS_DIR)
 DEPFLAGS=-MMD
 XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
 PICFLAG=-fPIC
 OWLPSFLAGS = -D USE_TIMESTAMP
-LIBS = -pthread -lconfuse -L../../libowlps -lowlps
+LIBS = -pthread -lconfuse -L$(LIBOWLPS_DIR) -lowlps
 LDFLAGS = $(LIBS) $(OWLPSFLAGS)
 
 
diff --git a/infrastructure-centred/owlps-aggregator/owlps-aggregator.h b/infrastructure-centred/owlps-aggregator/owlps-aggregator.h
index 7725692..7753e91 100644
--- a/infrastructure-centred/owlps-aggregator/owlps-aggregator.h
+++ b/infrastructure-centred/owlps-aggregator/owlps-aggregator.h
@@ -5,7 +5,8 @@
 #ifndef _OWLPS_AGGREGATOR_H_
 #define _OWLPS_AGGREGATOR_H_
 
-#include "../../libowlps/owlps.h"
+#include <owlps.h>
+
 #include <confuse.h>
 
 #define DEBUG
diff --git a/infrastructure-centred/owlps-client/Makefile b/infrastructure-centred/owlps-client/Makefile
index bfe3614..58e631f 100644
--- a/infrastructure-centred/owlps-client/Makefile
+++ b/infrastructure-centred/owlps-client/Makefile
@@ -20,11 +20,14 @@ TARGET=owlps-client
 HEADER=
 
 # Flags
-CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I.
+LIBOWLPS_DIR = ../../libowlps
+LIBOWLPSCLIENT_DIR = ../libowlps-client
+CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
+	-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
 DEPFLAGS = -MMD
 XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
 PICFLAG = -fPIC
-LIBS = -L../../libowlps -lowlps -L../libowlps-client -lowlps-client
+LIBS = -L$(LIBOWLPS_DIR) -lowlps -L$(LIBOWLPSCLIENT_DIR) -lowlps-client
 STATIC_LIBS = -liw -lm -lrt
 
 
diff --git a/infrastructure-centred/owlps-client/Makefile_atheros b/infrastructure-centred/owlps-client/Makefile_atheros
index b48f1c9..4d60db9 100644
--- a/infrastructure-centred/owlps-client/Makefile_atheros
+++ b/infrastructure-centred/owlps-client/Makefile_atheros
@@ -23,13 +23,16 @@ TARGET=owlps-client
 HEADER=
 
 # Flags
-CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -I.
+LIBOWLPS_DIR = ../../libowlps
+LIBOWLPSCLIENT_DIR = ../libowlps-client
+CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
+	-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
 DEPFLAGS = -MMD
 XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
 PICFLAG = -fPIC
-LOWLPS = -L../../libowlps -lowlps
-LOWLPSA = ../../libowlps/libowlps.a
-LOWLPSCLIENTA = ../libowlps-client/libowlps-client.a
+LOWLPS = -L$(LIBOWLPS_DIR) -lowlps
+LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a
+LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a
 LIBS = $(LOWLPSCLIENTA) -liw -lm
 DYNAMIC_LIBS = $(LOWLPS) $(LIBS)
 SEMISTATIC_LIBS = $(LOWLPSA) $(LIBS)
diff --git a/infrastructure-centred/owlps-client/Makefile_atheros_openwrt-10.03 b/infrastructure-centred/owlps-client/Makefile_atheros_openwrt-10.03
index da3cb10..f824b73 100644
--- a/infrastructure-centred/owlps-client/Makefile_atheros_openwrt-10.03
+++ b/infrastructure-centred/owlps-client/Makefile_atheros_openwrt-10.03
@@ -23,13 +23,16 @@ TARGET=owlps-client
 HEADER=
 
 # Flags
-CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -I.
+LIBOWLPS_DIR = ../../libowlps
+LIBOWLPSCLIENT_DIR = ../libowlps-client
+CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
+	-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
 DEPFLAGS = -MMD
 XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
 PICFLAG = -fPIC
-LOWLPS = -L../../libowlps -lowlps
-LOWLPSA = ../../libowlps/libowlps.a
-LOWLPSCLIENTA = ../libowlps-client/libowlps-client.a
+LOWLPS = -L$(LIBOWLPS_DIR) -lowlps
+LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a
+LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a
 LIBS = $(LOWLPSCLIENTA) -liw -lm
 DYNAMIC_LIBS = $(LOWLPS) $(LIBS)
 SEMISTATIC_LIBS = $(LOWLPSA) $(LIBS)
diff --git a/infrastructure-centred/owlps-client/owlps-client.c b/infrastructure-centred/owlps-client/owlps-client.c
index 333eed4..109c14e 100644
--- a/infrastructure-centred/owlps-client/owlps-client.c
+++ b/infrastructure-centred/owlps-client/owlps-client.c
@@ -2,7 +2,7 @@
  * This file is part of the rtap localisation project.
  */
 
-#include "../libowlps-client/owlps-client.h"
+#include <owlps-client.h>
 
 #define DEBUG
 
diff --git a/infrastructure-centred/owlps-listener/Makefile b/infrastructure-centred/owlps-listener/Makefile
index b3e789f..6b87130 100644
--- a/infrastructure-centred/owlps-listener/Makefile
+++ b/infrastructure-centred/owlps-listener/Makefile
@@ -20,12 +20,16 @@ TARGET=owlps-listenerd
 HEADER=owlps-listener.h
 
 # Flags
-CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -I.
+LIBOWLPS_DIR = ../../libowlps
+LIBOWLPSCLIENT_DIR = ../libowlps-client
+CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
+	-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
 DEPFLAGS = -MMD
 XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
 PICFLAG = -fPIC
 OWLPSFLAGS = -D USE_CONFIG_FILE -lconfuse -D USE_PTHREAD -pthread
-LIBS = -L../../libowlps -lowlps -L../libowlps-client -lowlps-client \
+LIBS = -L$(LIBOWLPS_DIR) -lowlps \
+	-L$(LIBOWLPSCLIENT_DIR) -lowlps-client \
 	-lpcap -liw -lm
 LDFLAGS = $(LIBS) $(OWLPSFLAGS)
 
diff --git a/infrastructure-centred/owlps-listener/Makefile_atheros b/infrastructure-centred/owlps-listener/Makefile_atheros
index 3bf7ccd..70da0cf 100644
--- a/infrastructure-centred/owlps-listener/Makefile_atheros
+++ b/infrastructure-centred/owlps-listener/Makefile_atheros
@@ -23,13 +23,16 @@ TARGET=owlps-listenerd
 HEADER=owlps-listener.h
 
 # Flags
-CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -I.
+LIBOWLPS_DIR = ../../libowlps
+LIBOWLPSCLIENT_DIR = ../libowlps-client
+CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
+	-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
 DEPFLAGS = -MMD
 XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
 PICFLAG = -fPIC
-LOWLPS = -L../../libowlps -lowlps
-LOWLPSA = ../../libowlps/libowlps.a
-LOWLPSCLIENTA = ../libowlps-client/libowlps-client.a
+LOWLPS = -L$(LIBOWLPS_DIR) -lowlps
+LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a
+LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a
 LIBS = -lpcap -liw -lm $(LOWLPSCLIENTA)
 LATHEROS = -L$(TOOLCHAIN_USR)/lib -L$(TOOLCHAIN_USR_2)/lib
 IATHEROS = -I$(TOOLCHAIN_USR)/include -I$(TOOLCHAIN_USR_2)/include
diff --git a/infrastructure-centred/owlps-listener/owlps-listener.h b/infrastructure-centred/owlps-listener/owlps-listener.h
index 932a80f..b9c0707 100644
--- a/infrastructure-centred/owlps-listener/owlps-listener.h
+++ b/infrastructure-centred/owlps-listener/owlps-listener.h
@@ -14,8 +14,8 @@
 #define DEBUG
 
 
-#include "../../libowlps/owlps.h"
-#include "../libowlps-client/owlps-client.h"
+#include <owlps.h>
+#include <owlps-client.h>
 
 #include <pcap.h>