diff --git a/pinos/client/loop.c b/pinos/client/loop.c
index bbfa7f563..bf3130b9f 100644
--- a/pinos/client/loop.c
+++ b/pinos/client/loop.c
@@ -29,8 +29,8 @@
 #include <sys/signalfd.h>
 #include <pthread.h>
 
-#include <spa/include/spa/loop.h>
-#include <spa/include/spa/ringbuffer.h>
+#include <spa/loop.h>
+#include <spa/ringbuffer.h>
 
 #include <pinos/client/loop.h>
 #include <pinos/client/log.h>
diff --git a/pinos/client/type.c b/pinos/client/type.c
index e2115b96a..e2dd9b921 100644
--- a/pinos/client/type.c
+++ b/pinos/client/type.c
@@ -29,7 +29,7 @@
 #include "pinos/server/client-node.h"
 #include "pinos/server/module.h"
 
-#include "spa/include/spa/monitor.h"
+#include "spa/monitor.h"
 
 void
 pinos_type_init (PinosType *type)
diff --git a/pinos/examples/video-play.c b/pinos/examples/video-play.c
index a4d51a9b6..f47d6f6cf 100644
--- a/pinos/examples/video-play.c
+++ b/pinos/examples/video-play.c
@@ -22,11 +22,11 @@
 
 #include <SDL2/SDL.h>
 
-#include <spa/include/spa/type-map.h>
-#include <spa/include/spa/format-utils.h>
-#include <spa/include/spa/video/format-utils.h>
-#include <spa/include/spa/format-builder.h>
-#include <spa/include/spa/props.h>
+#include <spa/type-map.h>
+#include <spa/format-utils.h>
+#include <spa/video/format-utils.h>
+#include <spa/format-builder.h>
+#include <spa/props.h>
 
 #include <pinos/client/pinos.h>
 #include <pinos/client/sig.h>
diff --git a/pinos/gst/gstpinosformat.c b/pinos/gst/gstpinosformat.c
index 2915d037a..fe2d45f13 100644
--- a/pinos/gst/gstpinosformat.c
+++ b/pinos/gst/gstpinosformat.c
@@ -25,9 +25,9 @@
 #include <gst/audio/audio.h>
 
 #include <spa/lib/mapper.h>
-#include <spa/include/spa/format-builder.h>
-#include <spa/include/spa/video/format-utils.h>
-#include <spa/include/spa/audio/format-utils.h>
+#include <spa/format-builder.h>
+#include <spa/video/format-utils.h>
+#include <spa/audio/format-utils.h>
 
 #include "gstpinosformat.h"
 
diff --git a/pinos/gst/gstpinossink.c b/pinos/gst/gstpinossink.c
index 449b3b259..3e5cfe8e4 100644
--- a/pinos/gst/gstpinossink.c
+++ b/pinos/gst/gstpinossink.c
@@ -43,7 +43,7 @@
 #include <gst/allocators/gstfdmemory.h>
 #include <gst/video/video.h>
 
-#include <spa/include/spa/buffer.h>
+#include <spa/buffer.h>
 
 #include "gstpinosformat.h"
 
diff --git a/pinos/gst/gstpinossrc.c b/pinos/gst/gstpinossrc.c
index 064ed3e56..b7d15e2a1 100644
--- a/pinos/gst/gstpinossrc.c
+++ b/pinos/gst/gstpinossrc.c
@@ -45,7 +45,7 @@
 #include <gst/allocators/gstfdmemory.h>
 #include <gst/video/video.h>
 
-#include <spa/include/spa/buffer.h>
+#include <spa/buffer.h>
 
 #include "gstpinosclock.h"
 
diff --git a/pinos/modules/spa/spa-monitor.c b/pinos/modules/spa/spa-monitor.c
index 541599a60..e0697e0ad 100644
--- a/pinos/modules/spa/spa-monitor.c
+++ b/pinos/modules/spa/spa-monitor.c
@@ -26,9 +26,9 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-#include <spa/include/spa/node.h>
-#include <spa/include/spa/monitor.h>
-#include <spa/include/spa/pod-iter.h>
+#include <spa/node.h>
+#include <spa/monitor.h>
+#include <spa/pod-iter.h>
 #include <pinos/client/log.h>
 #include <pinos/server/node.h>
 
diff --git a/pinos/modules/spa/spa-node.c b/pinos/modules/spa/spa-node.c
index fd32daf4e..c7eaf4048 100644
--- a/pinos/modules/spa/spa-node.c
+++ b/pinos/modules/spa/spa-node.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <dlfcn.h>
 
-#include <spa/include/spa/node.h>
+#include <spa/node.h>
 
 #include "spa-node.h"
 
diff --git a/pinos/server/client-node.c b/pinos/server/client-node.c
index 0968613be..373f79782 100644
--- a/pinos/server/client-node.c
+++ b/pinos/server/client-node.c
@@ -36,8 +36,8 @@
 #include "pinos/server/core.h"
 #include "pinos/server/client-node.h"
 
-#include "spa/include/spa/node.h"
-#include "spa/include/spa/format-builder.h"
+#include "spa/node.h"
+#include "spa/format-builder.h"
 
 #define MAX_INPUTS       64
 #define MAX_OUTPUTS      64
diff --git a/pinos/server/core.h b/pinos/server/core.h
index 3bc74baa7..000a9d9d6 100644
--- a/pinos/server/core.h
+++ b/pinos/server/core.h
@@ -27,7 +27,7 @@ extern "C" {
 typedef struct _PinosCore PinosCore;
 typedef struct _PinosGlobal PinosGlobal;
 
-#include <spa/include/spa/log.h>
+#include <spa/log.h>
 
 #include <pinos/client/type.h>
 
diff --git a/pinos/server/link.c b/pinos/server/link.c
index 37a07f180..e849cbb94 100644
--- a/pinos/server/link.c
+++ b/pinos/server/link.c
@@ -20,8 +20,8 @@
 #include <string.h>
 
 #include <spa/lib/debug.h>
-#include <spa/include/spa/video/format.h>
-#include <spa/include/spa/pod-utils.h>
+#include <spa/video/format.h>
+#include <spa/pod-utils.h>
 
 #include "pinos/client/pinos.h"
 #include "pinos/client/interfaces.h"
diff --git a/pinos/server/link.h b/pinos/server/link.h
index d8699b362..ad40062c7 100644
--- a/pinos/server/link.h
+++ b/pinos/server/link.h
@@ -26,7 +26,7 @@ extern "C" {
 
 typedef struct _PinosLink PinosLink;
 
-#include <spa/include/spa/ringbuffer.h>
+#include <spa/ringbuffer.h>
 
 #include <pinos/client/mem.h>
 
diff --git a/pinos/server/main-loop.c b/pinos/server/main-loop.c
index 05e1f4cb3..f36154065 100644
--- a/pinos/server/main-loop.c
+++ b/pinos/server/main-loop.c
@@ -22,8 +22,8 @@
 #include <errno.h>
 #include <sys/eventfd.h>
 
-#include "spa/include/spa/list.h"
-#include "spa/include/spa/ringbuffer.h"
+#include "spa/list.h"
+#include "spa/ringbuffer.h"
 #include "pinos/client/log.h"
 #include "pinos/server/main-loop.h"
 
diff --git a/pinos/server/node.h b/pinos/server/node.h
index 018e2722d..7cba7c171 100644
--- a/pinos/server/node.h
+++ b/pinos/server/node.h
@@ -29,8 +29,8 @@ extern "C" {
 
 typedef struct _PinosNode PinosNode;
 
-#include <spa/include/spa/clock.h>
-#include <spa/include/spa/node.h>
+#include <spa/clock.h>
+#include <spa/node.h>
 
 #include <pinos/client/mem.h>
 #include <pinos/client/transport.h>
diff --git a/pinos/server/port.h b/pinos/server/port.h
index 5d5cd904d..1df0f6bbb 100644
--- a/pinos/server/port.h
+++ b/pinos/server/port.h
@@ -29,7 +29,7 @@ extern "C" {
 
 typedef struct _PinosPort PinosPort;
 
-#include <spa/include/spa/node.h>
+#include <spa/node.h>
 
 #include <pinos/client/introspect.h>
 #include <pinos/client/mem.h>
diff --git a/pinos/server/resource.h b/pinos/server/resource.h
index e60cfbfd1..49c35ecf1 100644
--- a/pinos/server/resource.h
+++ b/pinos/server/resource.h
@@ -29,7 +29,7 @@ extern "C" {
 
 typedef struct _PinosResource PinosResource;
 
-#include <spa/include/spa/list.h>
+#include <spa/list.h>
 
 #include <pinos/client/sig.h>