diff --git a/Makefile.am b/Makefile.am
index 35240986..cc763b84 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -512,7 +512,8 @@ src_ofonod_SOURCES = $(gdbus_sources) $(builtin_sources) src/ofono.ver \
 			src/cdma-smsutil.h src/cdma-smsutil.c \
 			src/cdma-sms.c src/private-network.c src/cdma-netreg.c \
 			src/cdma-provision.c src/handsfree.c \
-			src/handsfree-audio.c src/bluetooth.h
+			src/handsfree-audio.c src/bluetooth.h \
+			src/hfp.h
 
 src_ofonod_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ -ldl
 
diff --git a/src/hfp.h b/src/hfp.h
new file mode 100644
index 00000000..79563e14
--- /dev/null
+++ b/src/hfp.h
@@ -0,0 +1,46 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2013  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+/* HFP AG supported features bitmap. Bluetooth HFP 1.6 spec page 88 */
+enum hfp_ag_feature {
+	HFP_AG_FEATURE_3WAY =			0x1,
+	HFP_AG_FEATURE_ECNR =			0x2,
+	HFP_AG_FEATURE_VOICE_RECOG =		0x4,
+	HFP_AG_FEATURE_IN_BAND_RING_TONE =	0x8,
+	HFP_AG_FEATURE_ATTACH_VOICE_TAG =	0x10,
+	HFP_AG_FEATURE_REJECT_CALL =		0x20,
+	HFP_AG_FEATURE_ENHANCED_CALL_STATUS =	0x40,
+	HFP_AG_FEATURE_ENHANCED_CALL_CONTROL =	0x80,
+	HFP_AG_FEATURE_EXTENDED_RES_CODE =	0x100,
+	HFP_AG_FEATURE_CODEC_NEGOTIATION =	0x200,
+};
+
+/* HFP HF supported features bitmap. Bluetooth HFP 1.6 spec page 88 */
+enum hfp_hf_feature {
+	HFP_HF_FEATURE_ECNR =			0x1,
+	HFP_HF_FEATURE_3WAY =			0x2,
+	HFP_HF_FEATURE_CLIP =			0x4,
+	HFP_HF_FEATURE_VOICE_RECOGNITION =	0x8,
+	HFP_HF_FEATURE_REMOTE_VOLUME_CONTROL =	0x10,
+	HFP_HF_FEATURE_ENHANCED_CALL_STATUS =	0x20,
+	HFP_HF_FEATURE_ENHANCED_CALL_CONTROL =	0x40,
+	HFP_HF_FEATURE_CODEC_NEGOTIATION =	0x80,
+};