diff --git a/src/null.c b/src/null.c
new file mode 100644
index 0000000..00e5e8f
--- /dev/null
+++ b/src/null.c
@@ -0,0 +1,34 @@
+/* Copyright (c) 2015-2019, Michael Santos <michael.santos@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#include "xmppipe.h"
+
+    int
+handle_null(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
+        void * const userdata)
+{
+    xmppipe_state_t *state = userdata;
+    const char *name = NULL;
+
+    name = xmpp_stanza_get_name(stanza);
+    if (name == NULL)
+        return 1;
+
+    if (XMPPIPE_STREQ(name, "iq")
+            || XMPPIPE_STREQ(name, "message")
+            || XMPPIPE_STREQ(name, "presence"))
+        state->sm_ack_recv++;
+
+    return 1;
+}
diff --git a/src/xmppipe.c b/src/xmppipe.c
index aa874c2..fa9132b 100644
--- a/src/xmppipe.c
+++ b/src/xmppipe.c
@@ -39,7 +39,6 @@ int handle_presence_error(xmpp_conn_t * const, xmpp_stanza_t * const,
 int handle_sm_request(xmpp_conn_t * const, xmpp_stanza_t * const, void * const);
 int handle_sm_enabled(xmpp_conn_t * const, xmpp_stanza_t * const, void * const);
 int handle_sm_ack(xmpp_conn_t * const, xmpp_stanza_t * const, void * const);
-int handle_null(xmpp_conn_t * const, xmpp_stanza_t * const, void * const);
 
 int xmppipe_connect_init(xmppipe_state_t *);
 int xmppipe_stream_init(xmppipe_state_t *);
@@ -626,25 +625,6 @@ handle_connection(xmpp_conn_t * const conn, const xmpp_conn_event_t status,
     }
 }
 
-    int
-handle_null(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
-        void * const userdata)
-{
-    xmppipe_state_t *state = userdata;
-    const char *name = NULL;
-
-    name = xmpp_stanza_get_name(stanza);
-    if (name == NULL)
-        return 1;
-
-    if (XMPPIPE_STREQ(name, "iq")
-            || XMPPIPE_STREQ(name, "message")
-            || XMPPIPE_STREQ(name, "presence"))
-        state->sm_ack_recv++;
-
-    return 1;
-}
-
     int
 handle_sm_enabled(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
         void * const userdata)
diff --git a/src/xmppipe.h b/src/xmppipe.h
index af3a945..35d92c5 100644
--- a/src/xmppipe.h
+++ b/src/xmppipe.h
@@ -103,6 +103,7 @@ typedef struct {
 
 /* handlers */
 int handle_message(xmpp_conn_t * const, xmpp_stanza_t * const, void * const);
+int handle_null(xmpp_conn_t * const, xmpp_stanza_t * const, void * const);
 int handle_ping_reply(xmpp_conn_t * const, xmpp_stanza_t * const, void * const);
 int handle_version(xmpp_conn_t * const, xmpp_stanza_t * const, void * const);