diff --git a/src/handsfree-audio.c b/src/handsfree-audio.c
index 29fe3e7a..50be691f 100644
--- a/src/handsfree-audio.c
+++ b/src/handsfree-audio.c
@@ -37,18 +37,13 @@
 #include <ofono/handsfree-audio.h>
 
 #include "bluetooth.h"
+#include "hfp.h"
 #include "ofono.h"
 
 #define HFP_AUDIO_MANAGER_INTERFACE	OFONO_SERVICE ".HandsfreeAudioManager"
 #define HFP_AUDIO_AGENT_INTERFACE	OFONO_SERVICE ".HandsfreeAudioAgent"
 #define HFP_AUDIO_CARD_INTERFACE	OFONO_SERVICE ".HandsfreeAudioCard"
 
-/* Supported agent codecs */
-enum hfp_codec {
-	HFP_CODEC_CVSD = 0x01,
-	HFP_CODEC_MSBC = 0x02,
-};
-
 struct ofono_handsfree_card {
 	char *remote;
 	char *local;
diff --git a/src/hfp.h b/src/hfp.h
index 79563e14..64a70550 100644
--- a/src/hfp.h
+++ b/src/hfp.h
@@ -44,3 +44,9 @@ enum hfp_hf_feature {
 	HFP_HF_FEATURE_ENHANCED_CALL_CONTROL =	0x40,
 	HFP_HF_FEATURE_CODEC_NEGOTIATION =	0x80,
 };
+
+/* Supported agent codecs */
+enum hfp_codec {
+	HFP_CODEC_CVSD = 0x01,
+	HFP_CODEC_MSBC = 0x02,
+};