move headers to the correct location

include/astal-wp.h

@@ -0,0 +1,4 @@
+
+#include "astal/wireplumber/audio.h"
+#include "astal/wireplumber/endpoint.h"
+#include "astal/wireplumber/wp.h"

include/meson.build

@@ -1,8 +1,8 @@
-astal_wireplumber_inc = include_directories('.', 'wireplumber')
+astal_wireplumber_inc = include_directories('.', 'astal/wireplumber')
 astal_wireplumber_headers = files(
-    'wireplumber.h',
+    'astal-wp.h',
 )
 
-install_headers(astal_wireplumber_headers, subdir : 'astal')
+install_headers(astal_wireplumber_headers)
 
-subdir('wireplumber')
+subdir('astal/wireplumber')

include/wireplumber.h

@@ -1,4 +0,0 @@
-
-#include "wireplumber/audio.h"
-#include "wireplumber/endpoint.h"
-#include "wireplumber/wp.h"

src/audio.c

@@ -3,7 +3,7 @@
 #include <wp/wp.h>
 
 #include "endpoint.h"
-#include "wireplumber.h"
+#include "wp.h"
 
 struct _AstalWpAudio {
     GObject parent_instance;

src/endpoint.c

@@ -1,12 +1,6 @@
-#include "endpoint.h"
-
-#include <limits.h>
 #include <wp/wp.h>
 
 #include "endpoint-private.h"
-#include "glib-object.h"
-#include "glib.h"
-#include "glibconfig.h"
 #include "wp.h"
 
 struct _AstalWpEndpoint {

src/meson.build

@@ -46,7 +46,7 @@ if get_option('introspection')
         symbol_prefix : 'astal_wp',
         identifier_prefix : 'AstalWp',
         includes : ['GObject-2.0', 'Gio-2.0'],
-        header : 'astal/wireplumber.h',
+        header : 'astal-wp.h',
         export_packages : pkg_config_name,
         install : true
     )

src/wireplumber.c

@@ -2,9 +2,6 @@
 
 #include "audio.h"
 #include "endpoint-private.h"
-#include "endpoint.h"
-#include "glib-object.h"
-#include "glib.h"
 #include "wp.h"
 
 struct _AstalWpWp {
@@ -315,7 +312,7 @@ static void astal_wp_wp_class_init(AstalWpWpClass *class) {
     astal_wp_wp_properties[ASTAL_WP_WP_PROP_ENDPOINTS] =
         g_param_spec_pointer("endpoints", "endpoints", "endpoints", G_PARAM_READABLE);
     /**
-     * AstalWpAudio:default-speaker:
+     * AstalWpWp:default-speaker:
      *
      * The AstalWndpoint object representing the default speaker
      */
@@ -323,7 +320,7 @@ static void astal_wp_wp_class_init(AstalWpWpClass *class) {
         g_param_spec_object("default-speaker", "default-speaker", "default-speaker",
                             ASTAL_WP_TYPE_ENDPOINT, G_PARAM_READABLE);
     /**
-     * AstalWpAudio:default-microphone:
+     * AstalWpWp:default-microphone:
      *
      * The AstalWndpoint object representing the default speaker
      */