diff --git a/src/ac/ac_main.c b/src/ac/ac_main.c
index 5ec04065..a0602a0d 100644
--- a/src/ac/ac_main.c
+++ b/src/ac/ac_main.c
@@ -28,7 +28,7 @@
 #include "actube.h"
 #include "wtplist.h"
 #include "capwap/dtls.h"
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 #include "conf.h"
 #include "capwap/sock.h"
 
diff --git a/src/ac/conf.c b/src/ac/conf.c
index 775f03a1..84fa5db5 100644
--- a/src/ac/conf.c
+++ b/src/ac/conf.c
@@ -26,7 +26,7 @@
 
 #include "conf.h"
 
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 #include "capwap/cw_util.h"
 
 uint8_t conf_macaddress[12];
diff --git a/src/ac/db.c b/src/ac/db.c
index 254cd6c9..b4430373 100644
--- a/src/ac/db.c
+++ b/src/ac/db.c
@@ -1,7 +1,7 @@
 
 #include <sqlite3.h>
 
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 
 #include "conf.h"
 
diff --git a/src/ac/socklist.c b/src/ac/socklist.c
index bec41895..6b78f205 100644
--- a/src/ac/socklist.c
+++ b/src/ac/socklist.c
@@ -25,7 +25,7 @@
 #include <pthread.h>
 
 
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 #include "capwap/sock.h"
 
 
diff --git a/src/ac/wtplist.c b/src/ac/wtplist.c
index ea38db79..c7b0d7b2 100644
--- a/src/ac/wtplist.c
+++ b/src/ac/wtplist.c
@@ -35,7 +35,7 @@
 
 
 #include "conf.h"
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 
 /*
 static struct wtpman ** wtplist = 0;
diff --git a/src/ac/wtpman.c b/src/ac/wtpman.c
index f415d2ae..72e4d0b3 100644
--- a/src/ac/wtpman.c
+++ b/src/ac/wtpman.c
@@ -14,7 +14,7 @@
 #include "capwap/conn.h"
 #include "wtpman.h"
 #include "conf.h"
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 
 
 #include "conf.h"
diff --git a/src/capwap/Makefile b/src/capwap/Makefile
index faa925c5..848c5daf 100644
--- a/src/capwap/Makefile
+++ b/src/capwap/Makefile
@@ -106,30 +106,12 @@ CAPWAPOBJS= \
 	cwmsg_addelem_maximum_message_length.o \
 	cwmsg_addelem_image_identifier.o \
 	   cwmsg_send.o \
-	cwsend_change_state_event_response.o \
 	cwsend_unknow_response.o \
-	   cwsend_discovery_response.o \
-	   cwread_discovery_response.o \
-	   cwsend_discovery_request.o \
-	cw_read_image_data_request.o \
 	cw_send_configuration_update_response.o \
-	   cwread_join_response.o \
 	cwsend_echo_request.o \
 	cw_send_echo_response.o \
-	cw_send_image_file.o \
 	cw_handle_echo_request.o \
 	   cwsend_conf_status_response.o\
-	   cwread_configuration_status_request.o\
-	cwread_change_state_event_request.o\
-	cwread_wtp_event_request.o \
-	   process_conf_status_request.o \
-	   wtpinfo_readelem_wtp_mac_type.o \
-	   wtpinfo_readelem_wtp_descriptor.o \
-	   wtpinfo_readelem_discovery_type.o \
-	   wtpinfo_readelem_wtp_frame_tunnel_mode.o \
-	   wtpinfo_readelem_location_data.o \
-	   wtpinfo_readelem_wtp_name.o \
-	   wtpinfo_readelem_session_id.o \
 	   wtpinfo.o \
 	   aciplist.o \
 	   acinfo.o \
@@ -137,25 +119,9 @@ CAPWAPOBJS= \
 	   lwmsg_init.o \
 	   wtpinfo_lwreadelem_wtp_descriptor.o \
 	   hdr_print.o \
-	   cw_readelem_ecn_support.o \
-	cw_readelem_maximum_message_length.o \
-	cw_readelem_result_code.o\
-	cw_readelem_ac_name.o \
-	cw_readelem_ac_descriptor.o \
-	cw_readelem_radio_administrative_state.o \
-	cw_readelem_radio_operational_state.o \
-	cw_readelem_statistics_timer.o \
-	cw_readelem_mtu_discovery_padding.o \
-	cw_readelem_vendor_specific_payload.o \
-	cw_readelem_capwap_local_ip_addr.o \
-	   cw_readelem_wtp_reboot_statistics.o\
 	cwmsg_addelem_vendor_cisco_mwar_addr.o \
 	lw_readelem_wtp_board_data.o \
-	cw_readmsg_configuration_status_response.o \
-	cw_readmsg_configuration_status_request.o \
 	cw_cisco_id_to_str.o\
-	cw_readelem_cisco_wtp_radio_cfg.o \
-	cw_addelem_cisco_wtp_radio_cfg.o \
 	cw_strlist_get_str.o \
 	capwap_strings_msg.o \
 	capwap_strings_elem80211.o\
@@ -185,7 +151,37 @@ CAPWAPOBJS= \
 	format.o \
 	
 	
+#		cw_readmsg_configuration_status_response.o \
+	cw_readmsg_configuration_status_request.o \
+cw_readelem_maximum_message_length.o \
+	cw_readelem_result_code.o\
+	cw_readelem_ac_name.o \
+	cw_readelem_ac_descriptor.o \
+	cw_readelem_radio_administrative_state.o \
+	cw_readelem_radio_operational_state.o \
+	cw_readelem_statistics_timer.o \
+	cw_readelem_mtu_discovery_padding.o \
+	cw_readelem_vendor_specific_payload.o \
+	cw_readelem_capwap_local_ip_addr.o \
+	   cw_readelem_wtp_reboot_statistics.o\
+	conn_get_response.o \
+#	cwsend_change_state_event_response.o \
+	   cwread_discovery_response.o \
+	   cwsend_discovery_request.o \
+	cw_send_image_file.o \
+	   cwread_configuration_status_request.o\
+	cwread_change_state_event_request.o\
+	cwread_wtp_event_request.o \
+	   process_conf_status_request.o \
+	   cw_readelem_ecn_support.o \
 
+#	   wtpinfo_readelem_wtp_mac_type.o \
+#	   wtpinfo_readelem_wtp_descriptor.o \
+#	   wtpinfo_readelem_discovery_type.o \
+#	   wtpinfo_readelem_wtp_frame_tunnel_mode.o \
+#	   wtpinfo_readelem_location_data.o \
+#	   wtpinfo_readelem_wtp_name.o \
+#	   wtpinfo_readelem_session_id.o \
 #	   cwmsg_addelem_wtp_radio_infos.o \
 #	cw_addelem_vendor_specific_payload.o \
 	#cw_in_wtp_name.o \
@@ -199,6 +195,9 @@ CAPWAPOBJS= \
 	   #cwmsg_init.o \
 #	cw_readelem_80211_wtp_radio_info.o \
 #	cwmsg_addelem_80211_add_wlan.o \
+	   cwsend_discovery_response.o \
+	cw_readelem_cisco_wtp_radio_cfg.o \
+	cw_addelem_cisco_wtp_radio_cfg.o \
 	
 	   #cw_ianavendoridtostr.o \
 	   #cwmsg_addelem_result_code.o \
@@ -218,6 +217,11 @@ CAPWAPOBJS= \
 #	   process_msgelems.o \
 #	   cwsend_join_response.o \
 #	cwread_discovery_request.o\
+	   cwread_join_response.o \
+	cw_read_image_data_request.o \
+#	conn_send_cwmsg.o \
+#	conn_send_request.o \
+#	conn_wait_for_request.o \
 
 #
 # SSL objects
@@ -249,7 +253,6 @@ DTLSOBJS+=dtls_bio.o
 CONNOBJS= conn_create.o \
 	conn_detect_capwap.o \
 	conn_send_packet.o \
-	conn_send_cwmsg.o \
 	conn_process_packet.o \
 	conn_q_add_packet.o \
 	conn_q_get_packet.o \
@@ -259,14 +262,11 @@ CONNOBJS= conn_create.o \
 	connlist.o \
 	conn_create_noq.o \
 	conn_send_response.o \
-	conn_get_response.o \
 	conn_prepare_configuration_update_request.o \
 	cw_prepare_configuration_status_request.o \
 	cw_prepare_change_state_event_request.o \
 	conn_prepare_request.o \
-	conn_send_request.o \
 	conn_wait_for_message.o \
-	conn_wait_for_request.o \
 	conn_init.o \
 	conn_send_msg.o
 #conn_get_message.o  \
diff --git a/src/capwap/acinfo.c b/src/capwap/acinfo.c
index 056036d6..10475363 100644
--- a/src/capwap/acinfo.c
+++ b/src/capwap/acinfo.c
@@ -22,7 +22,7 @@
 #include <netinet/in.h>
 
 #include "capwap.h"
-#include "cw_log.h"
+#include "log.h"
 #include "cw_util.h"
 
 #include "acinfo.h"
diff --git a/src/capwap/conn_create.c b/src/capwap/conn_create.c
index d2936a82..d37d13cf 100644
--- a/src/capwap/conn_create.c
+++ b/src/capwap/conn_create.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "cw_log.h"
+#include "log.h"
 #include "conn.h"
 #include "sock.h"
 #include "capwap.h"
diff --git a/src/capwap/conn_create_noq.c b/src/capwap/conn_create_noq.c
index 29c547de..cc371054 100644
--- a/src/capwap/conn_create_noq.c
+++ b/src/capwap/conn_create_noq.c
@@ -28,7 +28,7 @@
 #include "conn.h"
 #include "sock.h"
 
-#include "cw_log.h"
+#include "log.h"
 
 /**
  * Create a connection object without queueing
diff --git a/src/capwap/conn_detect_capwap.c b/src/capwap/conn_detect_capwap.c
index d1ca1063..99d122d1 100644
--- a/src/capwap/conn_detect_capwap.c
+++ b/src/capwap/conn_detect_capwap.c
@@ -19,7 +19,7 @@
 #include "capwap.h"
 #include "wtpinfo.h"
 #include "conn.h"
-#include "cw_log.h"
+#include "log.h"
 #include "sock.h"
 
 void conn_detect_capwap(struct conn * conn, struct wtpinfo * wtpinfo)
diff --git a/src/capwap/conn_process_packet.c b/src/capwap/conn_process_packet.c
index 8e7d7e60..1268cdfb 100644
--- a/src/capwap/conn_process_packet.c
+++ b/src/capwap/conn_process_packet.c
@@ -24,7 +24,7 @@
 #include "capwap.h"
 #include "dbg.h"
 
-#include "cw_log.h"
+#include "log.h"
 #include "cw_util.h"
 
 #include "conn.h"
diff --git a/src/capwap/conn_q_add_packet.c b/src/capwap/conn_q_add_packet.c
index 4ca5fa65..996ad29b 100644
--- a/src/capwap/conn_q_add_packet.c
+++ b/src/capwap/conn_q_add_packet.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "cw_log.h"
+#include "log.h"
 #include "conn.h"
 
 
diff --git a/src/capwap/conn_send_msg.c b/src/capwap/conn_send_msg.c
index e2346100..bf8ca231 100644
--- a/src/capwap/conn_send_msg.c
+++ b/src/capwap/conn_send_msg.c
@@ -1,7 +1,7 @@
 
 #include "conn.h"
 #include "capwap.h"
-#include "cw_log.h"
+#include "log.h"
 #include "sock.h"
 
 
diff --git a/src/capwap/conn_send_packet.c b/src/capwap/conn_send_packet.c
index 21e973b2..28e810b1 100644
--- a/src/capwap/conn_send_packet.c
+++ b/src/capwap/conn_send_packet.c
@@ -25,7 +25,6 @@
 #include <arpa/inet.h>
 
 
-#include "cw_log.h"
 
 int conn_send_packet(struct conn * conn, const uint8_t * buffer, int len)
 {
diff --git a/src/capwap/cw_dbg_elem.c b/src/capwap/cw_dbg_elem.c
index 27b38885..74d4a4a7 100644
--- a/src/capwap/cw_dbg_elem.c
+++ b/src/capwap/cw_dbg_elem.c
@@ -1,6 +1,6 @@
 
 
-#include "cw_log.h"
+#include "log.h"
 #include "capwap.h"
 #include "capwap_cisco.h"
 #include "dbg.h"
diff --git a/src/capwap/cw_in_capwap_control_ipv4_address.c b/src/capwap/cw_in_capwap_control_ipv4_address.c
index 5c3667aa..4b8fdec4 100644
--- a/src/capwap/cw_in_capwap_control_ipv4_address.c
+++ b/src/capwap/cw_in_capwap_control_ipv4_address.c
@@ -2,7 +2,7 @@
 #include <errno.h>
 
 #include "action.h"
-#include "cw_log.h"
+#include "log.h"
 #include "itemstore.h"
 #include "capwap.h"
 #include "capwap_items.h"
diff --git a/src/capwap/cw_in_check_disc_req.c b/src/capwap/cw_in_check_disc_req.c
index 4c5d8a92..156b7e54 100644
--- a/src/capwap/cw_in_check_disc_req.c
+++ b/src/capwap/cw_in_check_disc_req.c
@@ -3,7 +3,7 @@
 #include "capwap_items.h"
 
 #include "intavltree.h"
-#include "cw_log.h"
+#include "log.h"
 #include "dbg.h"
 #include "sock.h"
 
diff --git a/src/capwap/cw_in_check_disc_resp.c b/src/capwap/cw_in_check_disc_resp.c
index 4583bdb2..de48e518 100644
--- a/src/capwap/cw_in_check_disc_resp.c
+++ b/src/capwap/cw_in_check_disc_resp.c
@@ -2,7 +2,7 @@
 #include "capwap.h"
 #include "capwap_items.h"
 #include "intavltree.h"
-#include "cw_log.h"
+#include "log.h"
 #include "dbg.h"
 #include "sock.h"
 
diff --git a/src/capwap/cw_in_check_img_data_req.c b/src/capwap/cw_in_check_img_data_req.c
index 42b1254a..aaa15ab1 100644
--- a/src/capwap/cw_in_check_img_data_req.c
+++ b/src/capwap/cw_in_check_img_data_req.c
@@ -3,7 +3,7 @@
 
 #include "capwap.h"
 #include "dbg.h"
-#include "cw_log.h"
+#include "log.h"
 #include "capwap_items.h"
 
 
diff --git a/src/capwap/cw_in_check_join_req.c b/src/capwap/cw_in_check_join_req.c
index 2315ccb8..048fe26f 100644
--- a/src/capwap/cw_in_check_join_req.c
+++ b/src/capwap/cw_in_check_join_req.c
@@ -2,7 +2,7 @@
 #include "capwap.h"
 #include "intavltree.h"
 #include "dbg.h"
-#include "cw_log.h"
+#include "log.h"
 #include "capwap_items.h"
 
 int cw_in_check_join_req(struct conn *conn, struct cw_action_in *a, uint8_t * data,
diff --git a/src/capwap/cw_in_check_join_resp.c b/src/capwap/cw_in_check_join_resp.c
index dc00793c..9605f475 100644
--- a/src/capwap/cw_in_check_join_resp.c
+++ b/src/capwap/cw_in_check_join_resp.c
@@ -4,7 +4,7 @@
 #include "capwap.h"
 #include "intavltree.h"
 #include "dbg.h"
-#include "cw_log.h"
+#include "log.h"
 #include "capwap_items.h"
 
 int cw_in_check_join_resp(struct conn *conn, struct cw_action_in *a, uint8_t * data,
diff --git a/src/capwap/cw_in_cisco_image_identifier.c b/src/capwap/cw_in_cisco_image_identifier.c
index 67a449a7..655c2dcb 100644
--- a/src/capwap/cw_in_cisco_image_identifier.c
+++ b/src/capwap/cw_in_cisco_image_identifier.c
@@ -1,6 +1,6 @@
 
 #include "action.h"
-#include "cw_log.h"
+#include "log.h"
 #include "itemstore.h"
 #include "capwap.h"
 
diff --git a/src/capwap/cw_in_generic.c b/src/capwap/cw_in_generic.c
index fd2fdd37..3a01bcc0 100644
--- a/src/capwap/cw_in_generic.c
+++ b/src/capwap/cw_in_generic.c
@@ -1,6 +1,6 @@
 
 #include "action.h"
-#include "cw_log.h"
+#include "log.h"
 #include "itemstore.h"
 #include "capwap.h"
 
diff --git a/src/capwap/cw_in_vendor_specific_payload.c b/src/capwap/cw_in_vendor_specific_payload.c
index 777104c0..9786a6a4 100644
--- a/src/capwap/cw_in_vendor_specific_payload.c
+++ b/src/capwap/cw_in_vendor_specific_payload.c
@@ -1,6 +1,6 @@
 
 #include "capwap.h"
-#include "cw_log.h"
+#include "log.h"
 #include "sock.h" //Tube
 /** 
  * @file 
diff --git a/src/capwap/cw_in_wtp_board_data.c b/src/capwap/cw_in_wtp_board_data.c
index acec612e..5cfd429a 100644
--- a/src/capwap/cw_in_wtp_board_data.c
+++ b/src/capwap/cw_in_wtp_board_data.c
@@ -29,7 +29,7 @@
 #include "itemstore.h"
 
 #include "cw_util.h"
-#include "cw_log.h"
+#include "log.h"
 
 
 
diff --git a/src/capwap/cw_in_wtp_descriptor.c b/src/capwap/cw_in_wtp_descriptor.c
index af191a81..c3e316ab 100644
--- a/src/capwap/cw_in_wtp_descriptor.c
+++ b/src/capwap/cw_in_wtp_descriptor.c
@@ -23,7 +23,7 @@
 #include "wtpinfo.h"
 
 #include "cw_util.h"
-#include "cw_log.h"
+#include "log.h"
 
 
 
diff --git a/src/capwap/cw_log.c b/src/capwap/cw_log.c
index a3bf8034..de0f1c6c 100644
--- a/src/capwap/cw_log.c
+++ b/src/capwap/cw_log.c
@@ -19,7 +19,7 @@
 
 #include <stdarg.h>
 
-#include "cw_log.h"
+#include "log.h"
 
 void (*cw_log_cb)(int level,const char * fromat, ...) = CW_LOG_DEFAULT_LOG;
 const char * cw_log_name = "cw";
diff --git a/src/capwap/cw_log_debug.c b/src/capwap/cw_log_debug.c
index 05135ea0..64661977 100644
--- a/src/capwap/cw_log_debug.c
+++ b/src/capwap/cw_log_debug.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "cw_log.h"
+#include "log.h"
 #include "capwap.h"
 #include "capwap_cisco.h"
 #include "lwapp_cisco.h"
diff --git a/src/capwap/cw_log_str2dbglevel.c b/src/capwap/cw_log_str2dbglevel.c
index f230f2ed..5cb7c589 100644
--- a/src/capwap/cw_log_str2dbglevel.c
+++ b/src/capwap/cw_log_str2dbglevel.c
@@ -19,7 +19,7 @@
 
 #include <string.h>
 
-#include "cw_log.h"
+#include "log.h"
 
 
 struct cw_dbg_cfgstrs cw_dbg_cfgstrs[] = {
diff --git a/src/capwap/cw_log_tofile.c b/src/capwap/cw_log_tofile.c
index 3f1f8df3..3767b3ad 100644
--- a/src/capwap/cw_log_tofile.c
+++ b/src/capwap/cw_log_tofile.c
@@ -1,7 +1,7 @@
 
 #include <stdio.h>
 
-#include "cw_log.h"
+#include "log.h"
 
 
 int cw_log_file_flags = LOG_PERROR;
diff --git a/src/capwap/cw_log_tosyslog.c b/src/capwap/cw_log_tosyslog.c
index 4c1987eb..74abc830 100644
--- a/src/capwap/cw_log_tosyslog.c
+++ b/src/capwap/cw_log_tosyslog.c
@@ -16,7 +16,7 @@
 
 */
 
-#include "cw_log.h"
+#include "log.h"
 
 
 void cw_vlog_(int level,const char * format, va_list args)
diff --git a/src/capwap/cw_out_ac_descriptor.c b/src/capwap/cw_out_ac_descriptor.c
index f14b1ec5..54880376 100644
--- a/src/capwap/cw_out_ac_descriptor.c
+++ b/src/capwap/cw_out_ac_descriptor.c
@@ -1,4 +1,4 @@
-#include "cw_log.h"
+#include "log.h"
 #include "conn.h"
 
 #include "itemstore.h"
diff --git a/src/capwap/cw_out_capwap_control_ip_addr_list.c b/src/capwap/cw_out_capwap_control_ip_addr_list.c
index fc4b4c0f..0d78e909 100644
--- a/src/capwap/cw_out_capwap_control_ip_addr_list.c
+++ b/src/capwap/cw_out_capwap_control_ip_addr_list.c
@@ -1,5 +1,5 @@
 
-#include "cw_log.h"
+#include "log.h"
 
 #include "capwap.h"
 #include "aciplist.h"
diff --git a/src/capwap/cw_out_cisco_ac_descriptor.c b/src/capwap/cw_out_cisco_ac_descriptor.c
index 9acc346f..e2c13049 100644
--- a/src/capwap/cw_out_cisco_ac_descriptor.c
+++ b/src/capwap/cw_out_cisco_ac_descriptor.c
@@ -1,4 +1,4 @@
-#include "cw_log.h"
+#include "log.h"
 #include "conn.h"
 
 #include "itemstore.h"
diff --git a/src/capwap/cw_out_generic.c b/src/capwap/cw_out_generic.c
index cf9fa889..d592f603 100644
--- a/src/capwap/cw_out_generic.c
+++ b/src/capwap/cw_out_generic.c
@@ -4,7 +4,7 @@
 #include "capwap.h"
 #include "capwap_items.h"
 
-#include "cw_log.h"
+#include "log.h"
 
 
 int cw_put_item(uint8_t * dst, struct cw_item *item)
diff --git a/src/capwap/cw_out_wtp_board_data.c b/src/capwap/cw_out_wtp_board_data.c
index a86c0138..2ce30a47 100644
--- a/src/capwap/cw_out_wtp_board_data.c
+++ b/src/capwap/cw_out_wtp_board_data.c
@@ -1,4 +1,4 @@
-#include "cw_log.h"
+#include "log.h"
 #include "conn.h"
 
 #include "itemstore.h"
diff --git a/src/capwap/cw_put_msg.c b/src/capwap/cw_put_msg.c
index 2e9bcd93..605325b8 100644
--- a/src/capwap/cw_put_msg.c
+++ b/src/capwap/cw_put_msg.c
@@ -25,7 +25,7 @@
 #include "capwap_items.h"
 #include "conn.h"
 
-#include "cw_log.h"
+#include "log.h"
 
 
 /**
diff --git a/src/capwap/cw_rand.c b/src/capwap/cw_rand.c
index 6198450e..8d6b7a66 100644
--- a/src/capwap/cw_rand.c
+++ b/src/capwap/cw_rand.c
@@ -28,7 +28,7 @@
 #include <fcntl.h>
 
 #include "cw_util.h"
-#include "cw_log.h"
+#include "log.h"
 
 char * cw_rand_dev = "/dev/random";
 
diff --git a/src/capwap/cw_readelem_maximum_message_length.c b/src/capwap/cw_readelem_maximum_message_length.c
index 7dd5f75d..dcf6bb53 100644
--- a/src/capwap/cw_readelem_maximum_message_length.c
+++ b/src/capwap/cw_readelem_maximum_message_length.c
@@ -18,7 +18,7 @@
 
 #include "capwap.h"
 #include "cw_util.h"
-#include "cw_log.h"
+#include "log.h"
 
 int cw_readelem_maximum_message_length(uint16_t *dst, int type,uint8_t *msgelem, int len)
 {
diff --git a/src/capwap/cw_util.c b/src/capwap/cw_util.c
index 6da75acc..1b2b55d7 100644
--- a/src/capwap/cw_util.c
+++ b/src/capwap/cw_util.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include "cw_util.h"
-#include "cw_log.h"
+#include "log.h"
 #include "capwap.h"
 
 void cw_mand_elem_found(int *l,int type)
diff --git a/src/capwap/dbg.c b/src/capwap/dbg.c
index 5a06e8de..45b09b71 100644
--- a/src/capwap/dbg.c
+++ b/src/capwap/dbg.c
@@ -20,7 +20,7 @@
 #include "dbg.h"
 #include "sock.h"
 
-#include "cw_log.h"
+#include "log.h"
 
 /**
  * Put a list of missing mandatory message elements to debug output
diff --git a/src/capwap/dtls_bio.c b/src/capwap/dtls_bio.c
index 8e0c63a0..b554487a 100644
--- a/src/capwap/dtls_bio.c
+++ b/src/capwap/dtls_bio.c
@@ -24,7 +24,7 @@
 
 #include <arpa/inet.h>
 
-#include "cw_log.h"
+#include "log.h"
 #include "dtls.h"
 
 
diff --git a/src/capwap/dtls_gnutls.c b/src/capwap/dtls_gnutls.c
index 7ef7042c..ba5096a7 100644
--- a/src/capwap/dtls_gnutls.c
+++ b/src/capwap/dtls_gnutls.c
@@ -24,7 +24,7 @@
 #include "dtls_gnutls.h"
 
 #include "conn.h"
-#include "cw_log.h"
+#include "log.h"
 #include "cw_util.h"
 
 int dtls_gnutls_init()
diff --git a/src/capwap/dtls_gnutls_accept.c b/src/capwap/dtls_gnutls_accept.c
index 6a946f82..deb55407 100644
--- a/src/capwap/dtls_gnutls_accept.c
+++ b/src/capwap/dtls_gnutls_accept.c
@@ -25,7 +25,7 @@
 
 
 #include "conn.h"
-#include "cw_log.h"
+#include "log.h"
 #include "sock.h"
 #include "capwap.h"
 #include "dtls_gnutls.h"
diff --git a/src/capwap/dtls_gnutls_connect.c b/src/capwap/dtls_gnutls_connect.c
index 214cb31f..996150b6 100644
--- a/src/capwap/dtls_gnutls_connect.c
+++ b/src/capwap/dtls_gnutls_connect.c
@@ -6,7 +6,7 @@
 #include "dtls_gnutls.h"
 
 #include "conn.h"
-#include "cw_log.h"
+#include "log.h"
 
 
 
diff --git a/src/capwap/dtls_openssl.c b/src/capwap/dtls_openssl.c
index eb4158d6..3defeba1 100644
--- a/src/capwap/dtls_openssl.c
+++ b/src/capwap/dtls_openssl.c
@@ -24,7 +24,7 @@
 
 #include "dtls_openssl.h"
 
-#include "cw_log.h"
+#include "log.h"
 #include "cw_util.h"
 
 #include "conn.h"
diff --git a/src/capwap/dtls_openssl_accept.c b/src/capwap/dtls_openssl_accept.c
index 91eb4757..f5952650 100644
--- a/src/capwap/dtls_openssl_accept.c
+++ b/src/capwap/dtls_openssl_accept.c
@@ -21,7 +21,7 @@
 #include "conn.h"
 #include "sock.h"
 #include "dtls_openssl.h"
-#include "cw_log.h"
+#include "log.h"
 
 int dtls_openssl_accept(struct conn *conn)
 {
diff --git a/src/capwap/dtls_openssl_bio.c b/src/capwap/dtls_openssl_bio.c
index 0aed1dea..e2fd6a8f 100644
--- a/src/capwap/dtls_openssl_bio.c
+++ b/src/capwap/dtls_openssl_bio.c
@@ -4,7 +4,7 @@
 #include "dtls.h"
 
 #include "conn.h"
-#include "cw_log.h"
+#include "log.h"
 
 
 BIO_METHOD *dtls_openssl_bio_method()
diff --git a/src/capwap/dtls_openssl_connect.c b/src/capwap/dtls_openssl_connect.c
index 52966add..63f354ea 100644
--- a/src/capwap/dtls_openssl_connect.c
+++ b/src/capwap/dtls_openssl_connect.c
@@ -1,7 +1,7 @@
 #include <openssl/err.h>
 
 #include "dtls_openssl.h"
-#include "cw_log.h"
+#include "log.h"
 #include "cw_util.h"
 
 /*
diff --git a/src/capwap/cw_log.h b/src/capwap/log.h
similarity index 56%
rename from src/capwap/cw_log.h
rename to src/capwap/log.h
index f389a0d6..3ba89c86 100644
--- a/src/capwap/cw_log.h
+++ b/src/capwap/log.h
@@ -42,13 +42,13 @@
 #define DBG_ELEM			0x00000002	/* Parsed CAPWAP/LWAPP message elements */
 #define DBG_ELEM_DMP			0x00000004	/* Dump CAPWAP message elements */
 
-#define DBG_CW_INFO			0x00000008	
+#define DBG_CW_INFO			0x00000008
 #define DBG_CW_RFC			0x00000010	/* RCF-realted CAPWAP errors */
 #define DBG_CW_STRICT			0x00000010
 #define DBG_CW_PKT_IN			0x00000020	/* Headers of incoming CAPWAP packets */
 #define DBG_CW_PKT_OUT			0x00000040	/* Headers of outgoing CAPWAP packets */
 #define DBG_CW_PKT_DMP			0x00000080	/* Dump packts */
-#define DBG_CW_PKT_DTL			0x00000100	
+#define DBG_CW_PKT_DTL			0x00000100
 #define DBG_CW_PKT_ERR			0x00000200
 #define DBG_MSG_ERR			0x00000400	/* Errors in CAPWAP messages */
 #define DBG_CW_IMG_DTL			0x00000800	/* Detail about image transfer */
@@ -68,7 +68,7 @@
 #define DBG_CW_PKT_INOUT		(DBG_CW_PKT_IN | DBG_CW_PKT_OUT)
 
 
-#define DBG_DETAIL_LINE_NUMBERS		0x00000001	
+#define DBG_DETAIL_LINE_NUMBERS		0x00000001
 #define DBG_DETAIL_ASC_DMP		0x00000002
 
 
@@ -79,20 +79,21 @@
 
 
 #ifndef CW_LOG_DUMP_ROW_LEN
-	#define CW_LOG_DUMP_ROW_LEN 32
+#define CW_LOG_DUMP_ROW_LEN 32
 #endif
 
 #ifndef CW_LOG_DUMP_ROW_TAB_LEN
-	#define CW_LOG_DUMP_ROW_TAB_LEN 8
+#define CW_LOG_DUMP_ROW_TAB_LEN 8
 #endif
 
 #ifndef CW_LOG_DEFAULT_LOG
-	#define CW_LOG_DEFAULT_LOG cw_log_tosyslog
+#define CW_LOG_DEFAULT_LOG cw_log_tosyslog
 #endif
 
 
-extern void cw_log_dbg_(int type,const char * file, int line, const char * fromat, ...);
-extern void cw_log_dbg_dmp_(int type,const char * file, int line, const uint8_t * data, int len,const char * format, ...);
+extern void cw_log_dbg_(int type, const char *file, int line, const char *fromat, ...);
+extern void cw_log_dbg_dmp_(int type, const char *file, int line, const uint8_t * data,
+			    int len, const char *format, ...);
 extern int cw_dbg_opt_detail;
 extern int cw_dbg_opt_level;
 
@@ -102,64 +103,64 @@ extern int cw_dbg_opt_level;
 
 
 #ifdef WITH_CW_LOG
-	#define cw_log(level,...) cw_log_cb(level,__VA_ARGS__)
+#define cw_log(level,...) cw_log_cb(level,__VA_ARGS__)
 #else
-	#define cw_log(...)
+#define cw_log(...)
 #endif
 
 #ifdef WITH_CW_LOG_DEBUG
 
 
-	#define cw_log_dbg(type,...) cw_log_dbg_(type,__FILE__,__LINE__,__VA_ARGS__)
-	#define cw_dbg(type,...) cw_log_dbg_(type,__FILE__,__LINE__,__VA_ARGS__)
-	#define cw_log_dbg_dmp(type,str,len,...) cw_log_dbg_dmp_(type,__FILE__,__LINE__,str,len,__VA_ARGS__)
-	#define cw_dbg_dmp(type,str,len,...) cw_log_dbg_dmp_(type,__FILE__,__LINE__,str,len,__VA_ARGS__)
-	#define cw_dbg_msgelem(msgtype,msgelemtype,msgbuf,msglen) cw_dbg_msgelem_(msgtype,msgelemtype,msgbuf,msglen)
-	#define cw_dbg_missing_mand_elems(conn, msgtyoe, mand) cw_dbg_missing_mand_elems_(conn, msgtyoe, mand)
+#define cw_log_dbg(type,...) cw_log_dbg_(type,__FILE__,__LINE__,__VA_ARGS__)
+#define cw_dbg(type,...) cw_log_dbg_(type,__FILE__,__LINE__,__VA_ARGS__)
+#define cw_log_dbg_dmp(type,str,len,...) cw_log_dbg_dmp_(type,__FILE__,__LINE__,str,len,__VA_ARGS__)
+#define cw_dbg_dmp(type,str,len,...) cw_log_dbg_dmp_(type,__FILE__,__LINE__,str,len,__VA_ARGS__)
+#define cw_dbg_msgelem(msgtype,msgelemtype,msgbuf,msglen) cw_dbg_msgelem_(msgtype,msgelemtype,msgbuf,msglen)
+#define cw_dbg_missing_mand_elems(conn, msgtyoe, mand) cw_dbg_missing_mand_elems_(conn, msgtyoe, mand)
 
-	#define lw_dbg_elem(msgtype,msgelemtype,msgbuf,msglen) lw_dbg_elem_(msgtype,msgelemtype,msgbuf,msglen)
+#define lw_dbg_elem(msgtype,msgelemtype,msgbuf,msglen) lw_dbg_elem_(msgtype,msgelemtype,msgbuf,msglen)
 
 #else
-	#define cw_log_dbg(...)
-	#define cw_dbg(...)
+#define cw_log_dbg(...)
+#define cw_dbg(...)
 
-	#define cw_dbg_missing_mand_elems(conn, msgtyoe, mand)
+#define cw_dbg_missing_mand_elems(conn, msgtyoe, mand)
 
 #endif
 
-extern void (*cw_log_cb)(int level,const char * fromat, ...);
-extern void (*cw_log_debug_cb)(int type, const char *format, ...);
+extern void (*cw_log_cb) (int level, const char *fromat, ...);
+extern void (*cw_log_debug_cb) (int type, const char *format, ...);
 
-extern void (*cw_log_debug_cbs[])(const char * fromat, ...);
-extern int cw_log_debug_dump_(int level,const uint8_t * data, int len, const char * format, ...);
-extern void cw_vlog_(int level,const char * format, va_list args);
-extern void cw_log_tosyslog(int level,const char *format, ...);
-extern void cw_log_tofile(int level,const char *format, ...);
+extern void (*cw_log_debug_cbs[]) (const char *fromat, ...);
+extern int cw_log_debug_dump_(int level, const uint8_t * data, int len,
+			      const char *format, ...);
+extern void cw_vlog_(int level, const char *format, va_list args);
+extern void cw_log_tosyslog(int level, const char *format, ...);
+extern void cw_log_tofile(int level, const char *format, ...);
 
 
-extern void cw_dbg_msgelem_(int msg, int msgelem, const uint8_t *msgbuf,int len);
+extern void cw_dbg_msgelem_(int msg, int msgelem, const uint8_t * msgbuf, int len);
 
 
 struct conn;
-extern void cw_dbg_missing_mand_elems_(struct conn * conn,int msgtyoe, int * mand);
+extern void cw_dbg_missing_mand_elems_(struct conn *conn, int msgtyoe, int *mand);
 
-extern void lw_dbg_elem(int msg_id,int elem_id,const uint8_t*elem_data,int elem_len);
+extern void lw_dbg_elem(int msg_id, int elem_id, const uint8_t * elem_data, int elem_len);
 
 extern int cw_log_debug_level;
-extern int cw_log_str2dbglevel(const char * str);
+extern int cw_log_str2dbglevel(const char *str);
 
 
-extern const char * cw_log_name;
+extern const char *cw_log_name;
 
-struct cw_dbg_cfgstrs
-{
+struct cw_dbg_cfgstrs {
 	const char *name;
 	int level;
-}; 
+};
 
 extern struct cw_dbg_cfgstrs cw_dbg_cfgstrs[];
 
 
 
 
-#endif 
+#endif
diff --git a/src/capwap/lw_readelem_wtp_board_data.c b/src/capwap/lw_readelem_wtp_board_data.c
index 08671a45..1c0c0ab5 100644
--- a/src/capwap/lw_readelem_wtp_board_data.c
+++ b/src/capwap/lw_readelem_wtp_board_data.c
@@ -5,7 +5,7 @@
 
 #include <arpa/inet.h>
 
-#include "cw_log.h"
+#include "log.h"
 #include "wtpinfo.h"
 
 #include "lwapp.h"
diff --git a/src/capwap/lw_readelem_wtp_name.c b/src/capwap/lw_readelem_wtp_name.c
index 219e380e..e9d57f8b 100644
--- a/src/capwap/lw_readelem_wtp_name.c
+++ b/src/capwap/lw_readelem_wtp_name.c
@@ -25,7 +25,7 @@
 #include "lwapp.h"
 
 #include "cw_util.h"
-#include "cw_log.h"
+#include "log.h"
 
 /**
  * Reads the LWAPP message element WTP Name
diff --git a/src/capwap/send.c b/src/capwap/send.c
index f66cefa2..1ca8bcff 100644
--- a/src/capwap/send.c
+++ b/src/capwap/send.c
@@ -2,7 +2,7 @@
 
 #include "conn.h"
 #include "capwap.h"
-#include "cw_log.h"
+#include "log.h"
 #include "sock.h"
 
 int cw_send_request(struct conn *conn,int msg_id)
diff --git a/src/capwap/wtpinfo.c b/src/capwap/wtpinfo.c
index 2c3c052b..b8ad9227 100644
--- a/src/capwap/wtpinfo.c
+++ b/src/capwap/wtpinfo.c
@@ -6,7 +6,7 @@
 #include "wtpinfo.h"
 #include "capwap.h"
 
-#include "cw_log.h"
+#include "log.h"
 
 
 /*
diff --git a/src/wtp/conf_uci.c b/src/wtp/conf_uci.c
index 77a2bf8f..8f5e814e 100644
--- a/src/wtp/conf_uci.c
+++ b/src/wtp/conf_uci.c
@@ -12,10 +12,10 @@
 #include <uci.h>
 
 #include "capwap/capwap.h"
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 #include "wtp_conf.h"
 
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 
 #include "capwap/bstr.h"
 
diff --git a/src/wtp/discovery.c b/src/wtp/discovery.c
index 9336735b..6ef18cad 100644
--- a/src/wtp/discovery.c
+++ b/src/wtp/discovery.c
@@ -26,7 +26,7 @@
 
 #include "capwap/capwap.h"
 #include "capwap/capwap_items.h"
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 #include "capwap/wtpinfo.h"
 #include "capwap/acinfo.h"
 #include "capwap/sock.h"
diff --git a/src/wtp/join.c b/src/wtp/join.c
index f3042cd4..26b7608e 100644
--- a/src/wtp/join.c
+++ b/src/wtp/join.c
@@ -9,7 +9,7 @@
 #include "wtp_conf.h"
 
 #include "capwap/dtls.h"
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 #include "capwap/sock.h"
 #include "capwap/dtls.h"
 #include "capwap/aciplist.h"
diff --git a/src/wtp/nlt.c b/src/wtp/nlt.c
index 313aedca..fa323e4d 100644
--- a/src/wtp/nlt.c
+++ b/src/wtp/nlt.c
@@ -3,7 +3,7 @@
 #include "netlink/genl/ctrl.h"
 #include <netlink/msg.h>
 
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 #include "capwap/avltree.h"
 
 #include "nlt.h"
diff --git a/src/wtp/run.c b/src/wtp/run.c
index b55519d3..ad6280a1 100644
--- a/src/wtp/run.c
+++ b/src/wtp/run.c
@@ -6,7 +6,7 @@
 #include "capwap/capwap.h"
 #include "capwap/conn.h"
 #include "capwap/radioinfo.h"
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 #include "capwap/dtls.h"
 #include "capwap/sock.h"
 #include "capwap/cw_util.h"
diff --git a/src/wtp/sulking.c b/src/wtp/sulking.c
index 555be23d..f202df4e 100644
--- a/src/wtp/sulking.c
+++ b/src/wtp/sulking.c
@@ -1,6 +1,6 @@
 #include <unistd.h>
 
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 
 #include "wtp.h"
 #include "wtp_conf.h"
diff --git a/src/wtp/wtp_conf.c b/src/wtp/wtp_conf.c
index a45da906..91841a1a 100644
--- a/src/wtp/wtp_conf.c
+++ b/src/wtp/wtp_conf.c
@@ -12,14 +12,14 @@
 
 
 #include "capwap/capwap.h"
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 #include "capwap/cw_util.h"
 
 #include "wtp_conf.h"
 
 
 #include "capwap/sock.h"
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 
 #include "capwap/bstr.h"
 
diff --git a/src/wtp/wtp_interface.c b/src/wtp/wtp_interface.c
index 3bef2ed7..2d2ebedd 100644
--- a/src/wtp/wtp_interface.c
+++ b/src/wtp/wtp_interface.c
@@ -6,7 +6,7 @@
 #include "capwap/acinfo.h"
 #include "capwap/conn.h"
 #include "capwap/capwap_80211.h"
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 
 #include "wtp_conf.h"
 #include "wtp_interface.h"
diff --git a/src/wtp/wtp_main.c b/src/wtp/wtp_main.c
index 3f72409b..a0a0dba7 100644
--- a/src/wtp/wtp_main.c
+++ b/src/wtp/wtp_main.c
@@ -6,7 +6,7 @@
 #include "capwap/capwap.h"
 #include "capwap/capwap_items.h"
 #include "capwap/conn.h"
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 #include "capwap/dtls.h"
 #include "capwap/acpriolist.h"
 
diff --git a/src/wtp/wtpdrv.c b/src/wtp/wtpdrv.c
index 111b6a96..2ff10f45 100644
--- a/src/wtp/wtpdrv.c
+++ b/src/wtp/wtpdrv.c
@@ -8,7 +8,7 @@
 #include "nlt.h"
 
 
-#include "capwap/cw_log.h"
+#include "capwap/log.h"
 #include "capwap/radioinfo.h"
 #include "capwap/sock.h"
 #include "capwap/capwap_80211.h"