diff --git a/src/cw/capwap.h b/src/cw/capwap.h
index 8e6fae2e..87cb6038 100644
--- a/src/cw/capwap.h
+++ b/src/cw/capwap.h
@@ -26,14 +26,13 @@
 #define __CAPWAP_H
 
 #include <stdint.h>
-#include <string.h>
+//#include <string.h>
 
 #include <errno.h>
 #include <arpa/inet.h>
 
 #include "conn.h"
 
-#include "lwapp.h"
 #include "strlist.h"
 
 
diff --git a/src/cw/cw_out_image_data.c b/src/cw/cw_out_image_data.c
index 2308d5a2..6ef159f1 100644
--- a/src/cw/cw_out_image_data.c
+++ b/src/cw/cw_out_image_data.c
@@ -10,7 +10,7 @@
 
 #include "sock.h"
 
-
+#include "lwapp.h"