diff --git a/src/cw/Makefile b/src/cw/Makefile
index 419242d3..078c8c27 100644
--- a/src/cw/Makefile
+++ b/src/cw/Makefile
@@ -179,7 +179,6 @@ MISCSRC=\
 	capwap_strings_state.c\
 	capwap_strings_vendor.c\
 	conn_create_noq.c\
-	conn_destroy.c\
 	connlist.c\
 	conn_prepare_image_data_request.c\
 	cw_decode_msg.c \
@@ -211,6 +210,7 @@ MISCSRC=\
 #	conn_send_request.c\
 #	cw_put_msg.c\
 #	conn_process_packet.c\
+#	conn_destroy.c\
 
 DTLSSRC+=\
 	dtls_bio.c\
diff --git a/src/cw/conn.c b/src/cw/conn.c
index 3081dcc7..02f6c126 100644
--- a/src/cw/conn.c
+++ b/src/cw/conn.c
@@ -938,3 +938,24 @@ int cw_read_messages(struct cw_Conn *conn)
 	errno = EAGAIN;
 	return -1;
 }
+
+
+
+/**
+ * Destroy a conn object
+ * @param object to destroy
+ */
+void conn_destroy(struct cw_Conn * conn)
+{
+	if (conn->fragman)
+		fragman_destroy(conn->fragman);
+	if (conn->q)
+		free (conn->q);
+
+	if (conn->msg_callbacks)
+		mavl_destroy(conn->msg_callbacks);
+
+	free(conn);
+}
+
+
diff --git a/src/cw/conn_destroy.c b/src/cw/conn_destroy.c
deleted file mode 100644
index e065d521..00000000
--- a/src/cw/conn_destroy.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-    This file is part of actube.
-
-    actube is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    libcapwap is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file
- * @brief Implements conn_destroy
- */
-
-#include <stdlib.h>
-
-#include "conn.h"
-
-/**
- * Destroy a conn object
- * @param object to destroy
- */
-void conn_destroy(struct cw_Conn * conn)
-{
-	if (conn->fragman)
-		fragman_destroy(conn->fragman);
-	if (conn->q)
-		free (conn->q);
-
-	if (conn->msg_callbacks)
-		mavl_destroy(conn->msg_callbacks);
-
-	free(conn);
-}
-
-