diff --git a/meson.build b/meson.build
index 3f9957df3..fae5356b9 100644
--- a/meson.build
+++ b/meson.build
@@ -116,7 +116,6 @@ configure_file(input : 'config.h.meson',
   configuration : cdata)
 
 configinc = include_directories('.')
-pinosinc = include_directories('pinos')
 
 # Find dependencies
 glib_dep = dependency('glib-2.0', version : '>=2.32.0')
diff --git a/pinos/client/loop.c b/pinos/client/loop.c
index 339d29abe..f3f261ed7 100644
--- a/pinos/client/loop.c
+++ b/pinos/client/loop.c
@@ -513,21 +513,17 @@ loop_add_signal (SpaLoopUtils        *utils,
 {
   PinosLoopImpl *impl = SPA_CONTAINER_OF (utils, PinosLoopImpl, utils);
   SpaSourceImpl *source;
-#if 0
   sigset_t mask;
-#endif
 
   source = calloc (1, sizeof (SpaSourceImpl));
 
   source->source.loop = &impl->loop;
   source->source.func = source_signal_func;
   source->source.data = data;
-#if 0
   sigemptyset (&mask);
   sigaddset (&mask, signal_number);
   source->source.fd = signalfd (-1, &mask, SFD_CLOEXEC | SFD_NONBLOCK);
   sigprocmask (SIG_BLOCK, &mask, NULL);
-#endif
   source->source.mask = SPA_IO_IN;
   source->close = true;
   source->func.signal = func;
diff --git a/pinos/client/loop.h b/pinos/client/loop.h
index ad84731da..9517edecb 100644
--- a/pinos/client/loop.h
+++ b/pinos/client/loop.h
@@ -26,7 +26,7 @@ extern "C" {
 
 #include <spa/include/spa/list.h>
 #include <spa/include/spa/loop.h>
-#include <pinos/client/signal.h>
+#include <pinos/client/sig.h>
 
 typedef struct _PinosLoop PinosLoop;
 
diff --git a/pinos/client/signal.h b/pinos/client/sig.h
similarity index 100%
rename from pinos/client/signal.h
rename to pinos/client/sig.h
diff --git a/pinos/client/transport.h b/pinos/client/transport.h
index 839cebf6f..02e06dbd2 100644
--- a/pinos/client/transport.h
+++ b/pinos/client/transport.h
@@ -34,7 +34,7 @@ typedef struct _PinosTransportArea PinosTransportArea;
 #include <spa/node.h>
 
 #include <pinos/client/mem.h>
-#include <pinos/client/signal.h>
+#include <pinos/client/sig.h>
 
 #define PINOS_TRANSPORT_CMD_NONE         0
 #define PINOS_TRANSPORT_CMD_NEED_DATA    (1<<0)
diff --git a/pinos/modules/meson.build b/pinos/modules/meson.build
index 550433c4c..ac4d6d1df 100644
--- a/pinos/modules/meson.build
+++ b/pinos/modules/meson.build
@@ -8,7 +8,7 @@ pinos_module_c_args = [
 
 pinos_module_autolink = shared_library('pinos-module-autolink', [ 'module-autolink.c' ],
   c_args : pinos_module_c_args,
-  include_directories : [configinc, pinosinc, spa_inc],
+  include_directories : [configinc, spa_inc],
   link_with : spalib,
   install : true,
   install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
@@ -17,7 +17,7 @@ pinos_module_autolink = shared_library('pinos-module-autolink', [ 'module-autoli
 
 pinos_module_protocol_dbus = shared_library('pinos-module-protocol-dbus', [ 'module-protocol-dbus.c', gdbus_target ],
   c_args : pinos_module_c_args,
-  include_directories : [configinc, pinosinc, spa_inc],
+  include_directories : [configinc, spa_inc],
   link_with : spalib,
   install : true,
   install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
@@ -26,7 +26,7 @@ pinos_module_protocol_dbus = shared_library('pinos-module-protocol-dbus', [ 'mod
 
 pinos_module_protocol_native = shared_library('pinos-module-protocol-native', [ 'module-protocol-native.c' ],
   c_args : pinos_module_c_args,
-  include_directories : [configinc, pinosinc, spa_inc],
+  include_directories : [configinc, spa_inc],
   link_with : spalib,
   install : true,
   install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
@@ -35,7 +35,7 @@ pinos_module_protocol_native = shared_library('pinos-module-protocol-native', [
 
 pinos_module_suspend_on_idle = shared_library('pinos-module-suspend-on-idle', [ 'module-suspend-on-idle.c' ],
   c_args : pinos_module_c_args,
-  include_directories : [configinc, pinosinc, spa_inc],
+  include_directories : [configinc, spa_inc],
   link_with : spalib,
   install : true,
   install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
diff --git a/pinos/modules/spa/meson.build b/pinos/modules/spa/meson.build
index 170e61967..e79e5ff63 100644
--- a/pinos/modules/spa/meson.build
+++ b/pinos/modules/spa/meson.build
@@ -16,7 +16,7 @@ pinos_module_spa_c_args = [
 
 pinos_module_spa = shared_library('pinos-module-spa', pinos_module_spa_sources,
   c_args : pinos_module_spa_c_args,
-  include_directories : [configinc, pinosinc, spa_inc],
+  include_directories : [configinc, spa_inc],
   link_with : spalib,
   install : true,
   install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
diff --git a/pinos/modules/spa/module.c b/pinos/modules/spa/module.c
index f5be2aba8..e04d105bb 100644
--- a/pinos/modules/spa/module.c
+++ b/pinos/modules/spa/module.c
@@ -21,9 +21,9 @@
 #include <getopt.h>
 #include <limits.h>
 
-#include <client/utils.h>
-#include <server/core.h>
-#include <server/module.h>
+#include <pinos/client/utils.h>
+#include <pinos/server/core.h>
+#include <pinos/server/module.h>
 
 #include "spa-monitor.h"
 #include "spa-node.h"
diff --git a/pinos/modules/spa/spa-node.h b/pinos/modules/spa/spa-node.h
index 374b6b9c4..b570e8434 100644
--- a/pinos/modules/spa/spa-node.h
+++ b/pinos/modules/spa/spa-node.h
@@ -20,8 +20,8 @@
 #ifndef __PINOS_SPA_NODE_H__
 #define __PINOS_SPA_NODE_H__
 
-#include <server/core.h>
-#include <server/node.h>
+#include <pinos/server/core.h>
+#include <pinos/server/node.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/pinos/tools/pinos-monitor.c b/pinos/tools/pinos-monitor.c
index ed261abd5..97bc8841d 100644
--- a/pinos/tools/pinos-monitor.c
+++ b/pinos/tools/pinos-monitor.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include <pinos/client/pinos.h>
-#include <pinos/client/signal.h>
+#include <pinos/client/sig.h>
 
 typedef struct {
   bool running;