9 files changed, 9 insertions, 9 deletions
diff --git a/src/modules/bt-ipc.c b/src/modules/bluetooth/ipc.c
index e585328e..e7b712da 100644
--- a/src/modules/bt-ipc.c
+++ b/src/modules/bluetooth/ipc.c
@@ -20,7 +20,7 @@
  *
  */
 
-#include "bt-ipc.h"
+#include "ipc.h"
 
 /* This table contains the string representation for messages */
 static const char *strmsg[] = {
diff --git a/src/modules/bt-ipc.h b/src/modules/bluetooth/ipc.h
index c900fcd1..c900fcd1 100644
--- a/src/modules/bt-ipc.h
+++ b/src/modules/bluetooth/ipc.h
diff --git a/src/modules/module-bt-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 654130bf..335a8ed5 100644
--- a/src/modules/module-bt-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -45,10 +45,10 @@
 #include <pulsecore/rtclock.h>
 
 #include "dbus-util.h"
-#include "module-bt-device-symdef.h"
-#include "bt-ipc.h"
-#include "bt-sbc.h"
-#include "bt-rtp.h"
+#include "module-bluetooth-device-symdef.h"
+#include "ipc.h"
+#include "sbc.h"
+#include "rtp.h"
 
 #define DEFAULT_SINK_NAME "bluetooth_sink"
 #define BUFFER_SIZE 2048
diff --git a/src/modules/module-bt-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index 2b0d6c5f..12473dff 100644
--- a/src/modules/module-bt-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -34,7 +34,7 @@
 #include <pulsecore/llist.h>
 
 #include "dbus-util.h"
-#include "module-bt-discover-symdef.h"
+#include "module-bluetooth-discover-symdef.h"
 
 PA_MODULE_AUTHOR("Joao Paulo Rechi Vita");
 PA_MODULE_DESCRIPTION("Detect available bluetooth audio devices and load bluetooth audio drivers");
diff --git a/src/modules/bt-rtp.h b/src/modules/bluetooth/rtp.h
index 690bd43a..690bd43a 100644
--- a/src/modules/bt-rtp.h
+++ b/src/modules/bluetooth/rtp.h
diff --git a/src/modules/bt-sbc.c b/src/modules/bluetooth/sbc.c
index 8e7b0607..6303421f 100644
--- a/src/modules/bt-sbc.c
+++ b/src/modules/bluetooth/sbc.c
@@ -41,10 +41,10 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include "bt-sbc_math.h"
-#include "bt-sbc_tables.h"
+#include "sbc_math.h"
+#include "sbc_tables.h"
 
-#include "bt-sbc.h"
+#include "sbc.h"
 
 #define SBC_SYNCWORD	0x9C
 
diff --git a/src/modules/bt-sbc.h b/src/modules/bluetooth/sbc.h
index ab47e329..ab47e329 100644
--- a/src/modules/bt-sbc.h
+++ b/src/modules/bluetooth/sbc.h
diff --git a/src/modules/bt-sbc_math.h b/src/modules/bluetooth/sbc_math.h
index b3d87a62..b3d87a62 100644
--- a/src/modules/bt-sbc_math.h
+++ b/src/modules/bluetooth/sbc_math.h
diff --git a/src/modules/bt-sbc_tables.h b/src/modules/bluetooth/sbc_tables.h
index 7ac4e68b..7ac4e68b 100644
--- a/src/modules/bt-sbc_tables.h
+++ b/src/modules/bluetooth/sbc_tables.h