Merge commit 'meins/next' into next

[paraslash.git] / ogg_afh.c

diff --git a/ogg_afh.c b/ogg_afh.c
index e91c6c2b343b464fd2d9ff0472eff52bdd21cae9..4e64f062e5e5f6a09d9629c491e1fab4b0a91ecb 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -5,18 +5,16 @@
  */
 /** \file ogg_afh.c para_server's ogg vorbis audio format handler */
 
+#include <regex.h>
 #include <inttypes.h>
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
-#include <osl.h>
 
 #include "para.h"
-#include "afh.h"
 #include "error.h"
+#include "afh.h"
 #include "string.h"
-#include "afs.h"
-#include "server.h"
 
 /** must be big enough to hold header */
 #define CHUNK_SIZE 32768