Clean up mess with header files

1 files changed, 13 insertions, 19 deletions

diff --git a/audio/headset.h b/audio/headset.h
index db1fef65b..ec57f1d87 100644
--- a/audio/headset.h
+++ b/audio/headset.h
@@ -20,15 +20,13 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
-#ifndef __AUDIO_HEADSET_H__
-#define __AUDIO_HEADSET_H__
-
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
 #include <dbus/dbus.h>
 
 #include "ipc.h"
+#include "device.h"
 
 #define AUDIO_HEADSET_INTERFACE "org.bluez.audio.Headset"
 
@@ -55,29 +53,25 @@ typedef enum {
 	SVC_HANDSFREE
 } headset_type_t;
 
-struct headset;
-
-struct headset *headset_init(void *device, sdp_record_t *record,
+struct headset *headset_init(struct device *dev, sdp_record_t *record,
 				uint16_t svc);
 
-void headset_free(void *device);
+void headset_free(struct device *dev);
 
-void headset_update(void *device, sdp_record_t *record, uint16_t svc);
+void headset_update(struct device *dev, sdp_record_t *record, uint16_t svc);
 
-int headset_get_config(void *device, int sock, struct ipc_packet *pkt,
+int headset_get_config(struct device *dev, int sock, struct ipc_packet *pkt,
 			int pkt_len, struct ipc_data_cfg **rsp, int *fd);
 
-headset_type_t headset_get_type(void *device);
-void headset_set_type(void *device, headset_type_t type);
-
-int headset_connect_rfcomm(void *device, int sock);
-int headset_close_rfcomm(void *device);
+headset_type_t headset_get_type(struct device *dev);
+void headset_set_type(struct device *dev, headset_type_t type);
 
-headset_state_t headset_get_state(void *device);
-void headset_set_state(void *device, headset_state_t state);
+int headset_connect_rfcomm(struct device *dev, int sock);
+int headset_close_rfcomm(struct device *dev);
 
-int headset_get_channel(void *device);
+headset_state_t headset_get_state(struct device *dev);
+void headset_set_state(struct device *dev, headset_state_t state);
 
-gboolean headset_is_active(void *device);
+int headset_get_channel(struct device *dev);
 
-#endif
+gboolean headset_is_active(struct device *dev);