8 files changed, 19 insertions, 18 deletions
diff --git a/plugins/ao/Makefile b/plugins/ao/Makefile
index df3b9fd3..d188294d 100644
--- a/plugins/ao/Makefile
+++ b/plugins/ao/Makefile
@@ -1,6 +1,6 @@
-OUT=ao.so
+OUT=ddb_aopsf.so
 
-CC=gcc
+CC?=gcc
 
 ZLIB_LIBS?=-lz
 
diff --git a/plugins/ao/main.c b/plugins/ao/main.c
index a4da36d0..18067410 100644
--- a/plugins/ao/main.c
+++ b/plugins/ao/main.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 
 #include "ao.h"
 #include "eng_protos.h"
diff --git a/plugins/ao/plugin.c b/plugins/ao/plugin.c
index ebef512e..65b3e1c8 100644
--- a/plugins/ao/plugin.c
+++ b/plugins/ao/plugin.c
@@ -18,7 +18,7 @@
 */
 #include <stdlib.h>
 #include <string.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 #include "ao.h"
 #include "eng_protos.h"
 
@@ -350,8 +350,8 @@ static DB_decoder_t plugin = {
     .plugin.version_minor = 0,
     .plugin.type = DB_PLUGIN_DECODER,
     .plugin.id = "psf",
-    .plugin.name = "Audio Overload plugin",
-    .plugin.descr = "psf, psf2, spu, ssf, minidsf player based on Audio Overload library",
+    .plugin.name = "PSF player using Audio Overload SDK",
+    .plugin.descr = "plays psf, psf2, spu, ssf, dsf, qsf file formats",
     .plugin.copyright = 
         "Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net>\n"
         "\n"
@@ -387,7 +387,7 @@ static DB_decoder_t plugin = {
 };
 
 DB_plugin_t *
-ao_load (DB_functions_t *api) {
+ddb_aopsf_load (DB_functions_t *api) {
     deadbeef = api;
     return DB_PLUGIN (&plugin);
 }
diff --git a/plugins/dumb/Makefile b/plugins/dumb/Makefile
index e9b05233..e993012f 100644
--- a/plugins/dumb/Makefile
+++ b/plugins/dumb/Makefile
@@ -1,4 +1,6 @@
-CC=gcc
+OUT=ddb_dumb.so
+
+CC?=gcc
 
 dumbpath=dumb-kode54
 
@@ -81,8 +83,6 @@ cdumb.c
 
 OBJECTS=$(SOURCES:.c=.o)
 
-OUT=dumb.so
-
 all: $(SOURCES) $(OUT)
 
 $(OUT): $(OBJECTS)
diff --git a/plugins/dumb/cdumb.c b/plugins/dumb/cdumb.c
index 405878ad..f947d94a 100644
--- a/plugins/dumb/cdumb.c
+++ b/plugins/dumb/cdumb.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include "dumb.h"
 #include "internal/it.h"
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
@@ -921,7 +921,7 @@ static DB_decoder_t plugin = {
 };
 
 DB_plugin_t *
-dumb_load (DB_functions_t *api) {
+ddb_dumb_load (DB_functions_t *api) {
     deadbeef = api;
     return DB_PLUGIN (&plugin);
 }
diff --git a/plugins/shn/Makefile b/plugins/shn/Makefile
index 7ce0e430..d76c8427 100644
--- a/plugins/shn/Makefile
+++ b/plugins/shn/Makefile
@@ -1,8 +1,9 @@
-OUT=shn.so
+OUT=ddb_shn.so
 
-CC=gcc
+CC?=gcc
 
-CFLAGS+=-Wall -fPIC -std=c99 -D_GNU_SOURCE -DHAVE_CONFIG_H -I. -I../..
+CFLAGS?=-I../..
+CFLAGS+=-Wall -fPIC -std=c99 -D_GNU_SOURCE -DHAVE_CONFIG_H -I.
 
 LDFLAGS+=-module -shared -lm
 
diff --git a/plugins/shn/shn.c b/plugins/shn/shn.c
index 881cf3b7..504f283c 100644
--- a/plugins/shn/shn.c
+++ b/plugins/shn/shn.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include "shorten.h"
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 #include "bitshift.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
@@ -1836,7 +1836,7 @@ static DB_decoder_t plugin = {
 };
 
 DB_plugin_t *
-shn_load (DB_functions_t *api) {
+ddb_shn_load (DB_functions_t *api) {
     deadbeef = api;
     return DB_PLUGIN (&plugin);
 }
diff --git a/plugins/shn/shn.h b/plugins/shn/shn.h
index 518334bc..e7d3bba8 100644
--- a/plugins/shn/shn.h
+++ b/plugins/shn/shn.h
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 
 extern DB_functions_t *deadbeef;