diff --git a/src/ac/ac_interface.c b/src/ac/ac_interface.c
index 7cd7c13e..7f8135dd 100644
--- a/src/ac/ac_interface.c
+++ b/src/ac/ac_interface.c
@@ -10,7 +10,7 @@
 #include "conf.h"
 
 #include "cw/capwap.h"
-#include "cw/capwap_80211.h"
+//#include "cw/capwap_80211.h"
 #include "cw/aciplist.h"
 
 
diff --git a/src/ac/ac_main.c b/src/ac/ac_main.c
index a7bb1c94..01311042 100644
--- a/src/ac/ac_main.c
+++ b/src/ac/ac_main.c
@@ -36,7 +36,7 @@
 #include "db.h"
 #include "cw/capwap_items.h"
 #include "cw/capwap_cisco.h"
-#include "cw/capwap_80211.h"
+//#include "cw/capwap_80211.h"
 #include "cw/action.h"
 #include "cw/capwap_crypto.h"
 #include "cw/mbag.h"
diff --git a/src/ac/wtpman.c b/src/ac/wtpman.c
index c8eeccf9..53df04c3 100644
--- a/src/ac/wtpman.c
+++ b/src/ac/wtpman.c
@@ -25,7 +25,7 @@
 
 #include <errno.h>
 
-#include "cw/capwap_80211.h"
+//#include "cw/capwap_80211.h"
 #include "cw/capwap_cisco.h"
 
 #include "cw/cw_util.h"
diff --git a/src/cw/capwap_80211_actions.h b/src/cw/capwap_80211_actions.h
index 1c5af01f..09bbfa99 100644
--- a/src/cw/capwap_80211_actions.h
+++ b/src/cw/capwap_80211_actions.h
@@ -1,6 +1,6 @@
 
 
-#include "capwap_80211.h"
+#include "capwap80211.h"
 #include "capwap_items.h"
 
 #define CW_ACTION_IN_80211_WTP_RADIO_INFORMATION 	\
diff --git a/src/cw/capwap_80211_actions_ac.c b/src/cw/capwap_80211_actions_ac.c
index e52a2301..117e3437 100644
--- a/src/cw/capwap_80211_actions_ac.c
+++ b/src/cw/capwap_80211_actions_ac.c
@@ -2,7 +2,7 @@
 
 #include "action.h"
 #include "capwap_80211_actions.h"
-#include "capwap_80211.h"
+#include "capwap80211.h"
 #include "capwap.h"
 
 
diff --git a/src/cw/capwap_80211_actions_wtp.c b/src/cw/capwap_80211_actions_wtp.c
index ac1c5259..3c1a1d4c 100644
--- a/src/cw/capwap_80211_actions_wtp.c
+++ b/src/cw/capwap_80211_actions_wtp.c
@@ -2,7 +2,7 @@
 
 #include "action.h"
 #include "capwap_80211_actions.h"
-#include "capwap_80211.h"
+#include "capwap80211.h"
 #include "capwap.h"
 
 
diff --git a/src/cw/capwap_strings_elem80211.c b/src/cw/capwap_strings_elem80211.c
index 97f53046..a5a70d47 100644
--- a/src/cw/capwap_strings_elem80211.c
+++ b/src/cw/capwap_strings_elem80211.c
@@ -1,5 +1,5 @@
-#include "capwap_80211.h"
-
+#include "capwap80211.h"
+#include "strlist.h"
 
 struct cw_strlist_elem capwap_strings_elem80211[] = {
 
diff --git a/src/cw/cw_out_radio_info.c b/src/cw/cw_out_radio_info.c
index 3b82f72b..21e1defc 100644
--- a/src/cw/cw_out_radio_info.c
+++ b/src/cw/cw_out_radio_info.c
@@ -1,7 +1,7 @@
 
 #include "capwap.h"
 #include "capwap_items.h"
-#include "capwap_80211.h"
+#include "capwap80211.h"
 #include "radio.h"
 
 #include "dbg.h"
diff --git a/src/mod/capwap80211/Makefile b/src/mod/capwap80211/Makefile
index ef8c3259..b026b3ab 100644
--- a/src/mod/capwap80211/Makefile
+++ b/src/mod/capwap80211/Makefile
@@ -1,6 +1,7 @@
 
 OBJS=\
-     mod_capwap80211_ac.o
+	mod_capwap80211_ac.o \
+	capwap80211_actions_ac.o
 
 NAME=libcapwap80211.a
 
diff --git a/src/mod/capwap80211/mod_capwap80211.h b/src/mod/capwap80211/mod_capwap80211.h
index a7326b90..7045b719 100644
--- a/src/mod/capwap80211/mod_capwap80211.h
+++ b/src/mod/capwap80211/mod_capwap80211.h
@@ -4,5 +4,7 @@
 struct mod_ac *mod_capwap80211_ac();
 struct mod_wtp *mod_capwap2011_wtp();
 
+extern int capwap80211_register_actions_ac(struct cw_actiondef *def);
+
 
 #endif
diff --git a/src/wtp/wtp_interface.c b/src/wtp/wtp_interface.c
index 29f8631f..2876ac26 100644
--- a/src/wtp/wtp_interface.c
+++ b/src/wtp/wtp_interface.c
@@ -3,7 +3,7 @@
 
 
 #include "cw/conn.h"
-#include "cw/capwap_80211.h"
+//#include "cw/capwap_80211.h"
 #include "cw/log.h"
 
 #include "wtp_conf.h"
diff --git a/src/wtp/wtp_main.c b/src/wtp/wtp_main.c
index 341d4869..d2c61f17 100644
--- a/src/wtp/wtp_main.c
+++ b/src/wtp/wtp_main.c
@@ -10,7 +10,7 @@
 #include "cw/log.h"
 #include "cw/dtls.h"
 #include "cw/acpriolist.h"
-#include "cw/capwap_80211.h"
+//#include "cw/capwap_80211.h"
 #include "cw/radio.h"
 
 #include "cw/mod.h"
diff --git a/src/wtp/wtpdrv.c b/src/wtp/wtpdrv.c
index 4ff5136b..7c23e7ab 100644
--- a/src/wtp/wtpdrv.c
+++ b/src/wtp/wtpdrv.c
@@ -15,7 +15,7 @@
 #include "cw/log.h"
 #include "cw/radioinfo.h"
 #include "cw/sock.h"
-#include "cw/capwap_80211.h"
+//#include "cw/capwap_80211.h"
 #include "cw/dbg.h"
 
 /*