diff --git a/src/cw/capwap.h b/src/cw/capwap.h
index 9824c7dd..c0f39030 100644
--- a/src/cw/capwap.h
+++ b/src/cw/capwap.h
@@ -618,11 +618,6 @@ static inline const char *cw_strelemp_(cw_strheap_t h, int msg_id)
 //int cw_process_msg(struct conn *conn, uint8_t * rawmsg, int len);
 
 
-extern int cw_in_generic(struct conn *conn, struct cw_action_in *a, uint8_t * data,
-			 int len,struct sockaddr *from);
-extern int cw_in_generic2(struct conn *conn, struct cw_action_in *a, uint8_t * data,
-			 int len,struct sockaddr *from);
-
 extern int cw_in_vendor_specific_payload(struct conn *conn, struct cw_action_in *a,
 					 uint8_t * data, int len,struct sockaddr *from);
 extern int cw_in_wtp_name(struct conn *conn, struct cw_action_in *a, uint8_t * data,
diff --git a/src/cw/cw.h b/src/cw/cw.h
index 6391ad4a..a01479b6 100644
--- a/src/cw/cw.h
+++ b/src/cw/cw.h
@@ -469,6 +469,15 @@ extern int cw_in_mtu_discovery_padding(struct conn *conn, struct cw_action_in *a
  * @defgroup CWELEMIN Input Handlers for Message Elements
  * @{
  */
+
+extern int cw_in_generic(struct conn *conn, struct cw_action_in *a, uint8_t * data,
+			 int len,struct sockaddr *from);
+extern int cw_in_generic2(struct conn *conn, struct cw_action_in *a, uint8_t * data,
+			 int len,struct sockaddr *from);
+
+
+
+
 extern int cw_in_wtp_reboot_statistics(struct conn *conn, struct cw_action_in *a,
 				       uint8_t * data, int len, struct sockaddr *from);