song: don't use GLib

src/PlaylistSong.cxx

@@ -31,6 +31,8 @@ extern "C" {
 #include "path.h"
 }
 
+#include <glib.h>
+
 #include <assert.h>
 #include <string.h>
 

src/Queue.cxx

@@ -21,6 +21,8 @@
 #include "Queue.hxx"
 #include "song.h"
 
+#include <glib.h>
+
 #include <stdlib.h>
 
 queue::queue(unsigned _max_length)

src/cue/cue_parser.c

@@ -23,6 +23,8 @@
 #include "song.h"
 #include "tag.h"
 
+#include <glib.h>
+
 #include <assert.h>
 #include <stdlib.h>
 

src/song.h

@@ -23,8 +23,6 @@
 #include "util/list.h"
 #include "gcc.h"
 
-#include <glib.h>
-
 #include <assert.h>
 #include <stddef.h>
 #include <stdbool.h>
@@ -68,7 +66,9 @@ struct song {
  */
 extern struct Directory detached_root;
 
-G_BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /** allocate a new song with a remote URL */
 struct song *
@@ -160,6 +160,8 @@ song_get_uri(const struct song *song);
 double
 song_get_duration(const struct song *song);
 
-G_END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif