Index: include/asterisk/features.h
===================================================================
--- include/asterisk/features.h	(revision 113378)
+++ include/asterisk/features.h	(working copy)
@@ -24,6 +24,8 @@
 #ifndef _AST_FEATURES_H
 #define _AST_FEATURES_H
 
+#include "asterisk/pbx.h"
+
 #define FEATURE_MAX_LEN		11
 #define FEATURE_APP_LEN		64
 #define FEATURE_APP_ARGS_LEN	256
@@ -32,6 +34,16 @@
 #define FEATURE_MOH_LEN		80  /* same as MAX_MUSICCLASS from channel.h */
 
 /*! \brief main call feature structure */
+
+enum {
+	AST_FEATURE_FLAG_NEEDSDTMF = (1 << 0),
+	AST_FEATURE_FLAG_ONPEER =    (1 << 1),
+	AST_FEATURE_FLAG_ONSELF =    (1 << 2),
+	AST_FEATURE_FLAG_BYCALLEE =  (1 << 3),
+	AST_FEATURE_FLAG_BYCALLER =  (1 << 4),
+	AST_FEATURE_FLAG_BYBOTH	 =   (3 << 3),
+};
+
 struct ast_call_feature {
 	int feature_mask;
 	char *fname;
@@ -47,7 +59,16 @@
 };
 
 
+#define FEATURE_RETURN_HANGUP		-1
+#define FEATURE_RETURN_SUCCESSBREAK	 0
+#define FEATURE_RETURN_PBX_KEEPALIVE	AST_PBX_KEEPALIVE
+#define FEATURE_RETURN_NO_HANGUP_PEER	AST_PBX_NO_HANGUP_PEER
+#define FEATURE_RETURN_PASSDIGITS	 21
+#define FEATURE_RETURN_STOREDIGITS	 22
+#define FEATURE_RETURN_SUCCESS	 	 23
+#define FEATURE_RETURN_KEEPTRYING    24
 
+
 /*!
  * \brief Park a call and read back parked location 
  * \param chan the channel to actually be parked
Index: main/features.c
===================================================================
--- main/features.c	(revision 113378)
+++ main/features.c	(working copy)
@@ -65,15 +65,6 @@
 
 #define AST_MAX_WATCHERS 256
 
-enum {
-	AST_FEATURE_FLAG_NEEDSDTMF = (1 << 0),
-	AST_FEATURE_FLAG_ONPEER =    (1 << 1),
-	AST_FEATURE_FLAG_ONSELF =    (1 << 2),
-	AST_FEATURE_FLAG_BYCALLEE =  (1 << 3),
-	AST_FEATURE_FLAG_BYCALLER =  (1 << 4),
-	AST_FEATURE_FLAG_BYBOTH	 =   (3 << 3),
-};
-
 struct feature_group_exten {
 	AST_LIST_ENTRY(feature_group_exten) entry;
 	AST_DECLARE_STRING_FIELDS(
@@ -552,15 +543,6 @@
 }
 
 
-#define FEATURE_RETURN_HANGUP		-1
-#define FEATURE_RETURN_SUCCESSBREAK	 0
-#define FEATURE_RETURN_PBX_KEEPALIVE	AST_PBX_KEEPALIVE
-#define FEATURE_RETURN_NO_HANGUP_PEER	AST_PBX_NO_HANGUP_PEER
-#define FEATURE_RETURN_PASSDIGITS	 21
-#define FEATURE_RETURN_STOREDIGITS	 22
-#define FEATURE_RETURN_SUCCESS	 	 23
-#define FEATURE_RETURN_KEEPTRYING    24
-
 #define FEATURE_SENSE_CHAN	(1 << 0)
 #define FEATURE_SENSE_PEER	(1 << 1)