22 files changed, 45 insertions, 45 deletions
diff --git a/src/polyp/polyplib-browser.c b/src/polyp/browser.c
index 9a389484..80051d54 100644
--- a/src/polyp/polyplib-browser.c
+++ b/src/polyp/browser.c
@@ -22,7 +22,7 @@
 #include <assert.h>
 #include <howl.h>
 
-#include "polyplib-browser.h"
+#include "browser.h"
 #include <polypcore/xmalloc.h>
 #include <polypcore/log.h>
 #include <polypcore/util.h>
diff --git a/src/polyp/polyplib-browser.h b/src/polyp/browser.h
index 853304d7..853304d7 100644
--- a/src/polyp/polyplib-browser.h
+++ b/src/polyp/browser.h
diff --git a/src/polyp/polyplib-context.c b/src/polyp/context.c
index c392f0fc..4ac11caa 100644
--- a/src/polyp/polyplib-context.c
+++ b/src/polyp/context.c
@@ -47,9 +47,9 @@
 
 #include <polypcore/winsock.h>
 
-#include "polyplib-internal.h"
-#include "polyplib-context.h"
-#include "polyplib-version.h"
+#include "internal.h"
+#include "context.h"
+#include "version.h"
 #include <polypcore/native-common.h>
 #include <polypcore/pdispatch.h>
 #include <polypcore/pstream.h>
diff --git a/src/polyp/polyplib-context.h b/src/polyp/context.h
index febb75f4..6496c703 100644
--- a/src/polyp/polyplib-context.h
+++ b/src/polyp/context.h
@@ -23,10 +23,10 @@
 ***/
 
 #include <polyp/sample.h>
-#include <polyp/polyplib-def.h>
+#include <polyp/def.h>
 #include <polyp/mainloop-api.h>
 #include <polyp/cdecl.h>
-#include <polyp/polyplib-operation.h>
+#include <polyp/operation.h>
 
 /** \file
  * Connection contexts for asynchrononous communication with a
diff --git a/src/polyp/polyplib-def.h b/src/polyp/def.h
index 0591ce6c..0591ce6c 100644
--- a/src/polyp/polyplib-def.h
+++ b/src/polyp/def.h
diff --git a/src/polyp/polyplib-error.c b/src/polyp/error.c
index 188d6a93..a137ab49 100644
--- a/src/polyp/polyplib-error.c
+++ b/src/polyp/error.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "polyplib-error.h"
+#include "error.h"
 #include <polypcore/native-common.h>
 
 static const char* const errortab[PA_ERROR_MAX] = {
diff --git a/src/polyp/polyplib-error.h b/src/polyp/error.h
index 1bb97822..1bb97822 100644
--- a/src/polyp/polyplib-error.h
+++ b/src/polyp/error.h
diff --git a/src/polyp/polyplib-internal.h b/src/polyp/internal.h
index b95a20f3..feb9f6f4 100644
--- a/src/polyp/polyplib-internal.h
+++ b/src/polyp/internal.h
@@ -28,9 +28,9 @@
 #include <polypcore/pdispatch.h>
 #include <polypcore/dynarray.h>
 
-#include "polyplib-context.h"
-#include "polyplib-stream.h"
-#include "polyplib-operation.h"
+#include "context.h"
+#include "stream.h"
+#include "operation.h"
 #include <polypcore/llist.h>
 #include <polypcore/native-common.h>
 #include <polyp/client-conf.h>
diff --git a/src/polyp/polyplib-introspect.c b/src/polyp/introspect.c
index 0bdffa35..d89eb9ed 100644
--- a/src/polyp/polyplib-introspect.c
+++ b/src/polyp/introspect.c
@@ -25,9 +25,9 @@
 
 #include <assert.h>
 
-#include "polyplib-introspect.h"
-#include "polyplib-context.h"
-#include "polyplib-internal.h"
+#include "introspect.h"
+#include "context.h"
+#include "internal.h"
 #include <polypcore/pstream-util.h>
 #include <polypcore/gccmacro.h>
 
diff --git a/src/polyp/polyplib-introspect.h b/src/polyp/introspect.h
index d3489908..75dc027f 100644
--- a/src/polyp/polyplib-introspect.h
+++ b/src/polyp/introspect.h
@@ -24,8 +24,8 @@
 
 #include <inttypes.h>
 
-#include <polyp/polyplib-operation.h>
-#include <polyp/polyplib-context.h>
+#include <polyp/operation.h>
+#include <polyp/context.h>
 #include <polyp/cdecl.h>
 #include <polyp/channelmap.h>
 #include <polyp/volume.h>
diff --git a/src/polyp/polyplib-operation.c b/src/polyp/operation.c
index ea336c17..0baa661b 100644
--- a/src/polyp/polyplib-operation.c
+++ b/src/polyp/operation.c
@@ -26,8 +26,8 @@
 #include <assert.h>
 
 #include <polypcore/xmalloc.h>
-#include "polyplib-internal.h"
-#include "polyplib-operation.h"
+#include "internal.h"
+#include "operation.h"
 
 pa_operation *pa_operation_new(pa_context *c, pa_stream *s) {
     pa_operation *o;
diff --git a/src/polyp/polyplib-operation.h b/src/polyp/operation.h
index cac03e30..fea82f10 100644
--- a/src/polyp/polyplib-operation.h
+++ b/src/polyp/operation.h
@@ -23,7 +23,7 @@
 ***/
 
 #include <polyp/cdecl.h>
-#include <polyp/polyplib-def.h>
+#include <polyp/def.h>
 
 /** \file
  * Asynchronous operations */
diff --git a/src/polyp/polyplib.h b/src/polyp/polypaudio.h
index b9b9b447..23208526 100644
--- a/src/polyp/polyplib.h
+++ b/src/polyp/polypaudio.h
@@ -25,18 +25,18 @@
 #include <polyp/cdecl.h>
 #include <polyp/mainloop-api.h>
 #include <polyp/sample.h>
-#include <polyp/polyplib-def.h>
-#include <polyp/polyplib-context.h>
-#include <polyp/polyplib-stream.h>
-#include <polyp/polyplib-introspect.h>
-#include <polyp/polyplib-subscribe.h>
-#include <polyp/polyplib-scache.h>
-#include <polyp/polyplib-version.h>
+#include <polyp/def.h>
+#include <polyp/context.h>
+#include <polyp/stream.h>
+#include <polyp/introspect.h>
+#include <polyp/subscribe.h>
+#include <polyp/scache.h>
+#include <polyp/version.h>
 
 /** \file
  * Include all polyplib header file at once. The following files are included: \ref mainloop-api.h, \ref sample.h,
- * \ref polyplib-def.h, \ref polyplib-context.h, \ref polyplib-stream.h,
- * \ref polyplib-introspect.h, \ref polyplib-subscribe.h and \ref polyplib-scache.h \ref polyplib-version.h
+ * \ref def.h, \ref context.h, \ref stream.h,
+ * \ref introspect.h, \ref subscribe.h and \ref scache.h \ref version.h
  * at once */
 
 /** \mainpage
@@ -57,13 +57,13 @@
  *
  * Use this if you develop your program in synchronous style and just
  * need a way to play or record data on the sound server. See
- * \ref polyplib-simple.h for more details.
+ * \ref simple.h for more details.
  *
  * \section async_api Asynchronous API
  *
  * Use this if you develop your programs in asynchronous, main loop
  * based style or want to use advanced features of the polypaudio
- * API. A good starting point is \ref polyplib-context.h
+ * API. A good starting point is \ref context.h
  *
  * The asynchronous API relies on an abstract main loop API that is
  * described in \ref mainloop-api.h. Two distinct implementations are
@@ -79,8 +79,8 @@
  *
  * The polypaudio libraries provide pkg-config snippets for the different modules. To use the
  * asynchronous API use "polyplib" as pkg-config file. GLIB main loop
- * support is available as "polyplib-glib-mainloop". The simple
- * synchronous API is available as "polyplib-simple".
+ * support is available as "glib-mainloop". The simple
+ * synchronous API is available as "simple".
  */
 
 #endif
diff --git a/src/polyp/polyplib-scache.c b/src/polyp/scache.c
index 1315af97..c274e359 100644
--- a/src/polyp/polyplib-scache.c
+++ b/src/polyp/scache.c
@@ -28,8 +28,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "polyplib-scache.h"
-#include "polyplib-internal.h"
+#include "scache.h"
+#include "internal.h"
 #include <polypcore/pstream-util.h>
 
 void pa_stream_connect_upload(pa_stream *s, size_t length) {
diff --git a/src/polyp/polyplib-scache.h b/src/polyp/scache.h
index 89d27597..41b956d2 100644
--- a/src/polyp/polyplib-scache.h
+++ b/src/polyp/scache.h
@@ -24,8 +24,8 @@
 
 #include <sys/types.h>
 
-#include <polyp/polyplib-context.h>
-#include <polyp/polyplib-stream.h>
+#include <polyp/context.h>
+#include <polyp/stream.h>
 #include <polyp/cdecl.h>
 
 /** \file
diff --git a/src/polyp/polyplib-simple.c b/src/polyp/simple.c
index 7436f007..6f20da89 100644
--- a/src/polyp/polyplib-simple.c
+++ b/src/polyp/simple.c
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "polyplib-simple.h"
+#include "simple.h"
 #include "polyplib.h"
 #include "mainloop.h"
 #include <polypcore/native-common.h>
diff --git a/src/polyp/polyplib-simple.h b/src/polyp/simple.h
index b01f30d5..31dcaef4 100644
--- a/src/polyp/polyplib-simple.h
+++ b/src/polyp/simple.h
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 
 #include "sample.h"
-#include "polyplib-def.h"
+#include "def.h"
 #include <polyp/cdecl.h>
 
 /** \file
diff --git a/src/polyp/polyplib-stream.c b/src/polyp/stream.c
index 63c9245b..007d5e24 100644
--- a/src/polyp/polyplib-stream.c
+++ b/src/polyp/stream.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "polyplib-internal.h"
+#include "internal.h"
 #include <polypcore/xmalloc.h>
 #include <polypcore/pstream-util.h>
 #include <polypcore/util.h>
diff --git a/src/polyp/polyplib-stream.h b/src/polyp/stream.h
index bc828b71..d8409b3b 100644
--- a/src/polyp/polyplib-stream.h
+++ b/src/polyp/stream.h
@@ -27,9 +27,9 @@
 #include <polyp/sample.h>
 #include <polyp/channelmap.h>
 #include <polyp/volume.h>
-#include <polyp/polyplib-def.h>
+#include <polyp/def.h>
 #include <polyp/cdecl.h>
-#include <polyp/polyplib-operation.h>
+#include <polyp/operation.h>
 
 /** \file
  * Audio streams for input, output and sample upload */
diff --git a/src/polyp/polyplib-subscribe.c b/src/polyp/subscribe.c
index 13fcfb42..c481f525 100644
--- a/src/polyp/polyplib-subscribe.c
+++ b/src/polyp/subscribe.c
@@ -26,8 +26,8 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include "polyplib-subscribe.h"
-#include "polyplib-internal.h"
+#include "subscribe.h"
+#include "internal.h"
 #include <polypcore/pstream-util.h>
 #include <polypcore/gccmacro.h>
 
diff --git a/src/polyp/polyplib-subscribe.h b/src/polyp/subscribe.h
index 920c9853..4986272d 100644
--- a/src/polyp/polyplib-subscribe.h
+++ b/src/polyp/subscribe.h
@@ -24,8 +24,8 @@
 
 #include <inttypes.h>
 
-#include <polyp/polyplib-def.h>
-#include <polyp/polyplib-context.h>
+#include <polyp/def.h>
+#include <polyp/context.h>
 #include <polyp/cdecl.h>
 
 /** \file
diff --git a/src/polyp/polyplib-version.h.in b/src/polyp/version.h.in
index 89e0a0e5..36cafb70 100644
--- a/src/polyp/polyplib-version.h.in
+++ b/src/polyp/version.h.in
@@ -22,7 +22,7 @@
   USA.
 ***/
 
-/* WARNING: Make sure to edit the real source file polyplib-version.h.in! */
+/* WARNING: Make sure to edit the real source file version.h.in! */
 
 /** \file
  * Define header version */