diff --git a/src/Makefile.am b/src/Makefile.am
index d562151d58..30b8a19c7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,6 +10,7 @@ runmodes.c runmodes.h \
 runmode-pcap.c runmode-pcap.h \
 runmode-pcap-file.c runmode-pcap-file.h \
 runmode-pfring.c runmode-pfring.h \
+runmode-nfq.c runmode-nfq.h \
 packet-queue.c packet-queue.h \
 data-queue.c data-queue.h \
 threads.c threads.h \
diff --git a/src/runmode-nfq.c b/src/runmode-nfq.c
new file mode 100644
index 0000000000..42133ccfe0
--- /dev/null
+++ b/src/runmode-nfq.c
@@ -0,0 +1,236 @@
+/* Copyright (C) 2007-2010 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program 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
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "suricata-common.h"
+#include "tm-threads.h"
+#include "conf.h"
+#include "runmodes.h"
+#include "runmode-nfq.h"
+#include "log-httplog.h"
+#include "output.h"
+#include "cuda-packet-batcher.h"
+#include "source-pfring.h"
+
+#include "alert-fastlog.h"
+#include "alert-prelude.h"
+#include "alert-unified-log.h"
+#include "alert-unified-alert.h"
+#include "alert-unified2-alert.h"
+#include "alert-debuglog.h"
+
+#include "util-debug.h"
+#include "util-time.h"
+#include "util-cpu.h"
+#include "util-affinity.h"
+
+/**
+ * \brief RunModeIpsNFQAuto set up the following thread packet handlers:
+ *        - Receive thread (from NFQ)
+ *        - Decode thread
+ *        - Stream thread
+ *        - Detect: If we have only 1 cpu, it will setup one Detect thread
+ *                  If we have more than one, it will setup num_cpus - 1
+ *                  starting from the second cpu available.
+ *        - Veredict thread (NFQ)
+ *        - Respond/Reject thread
+ *        - Outputs thread
+ *        By default the threads will use the first cpu available
+ *        except the Detection threads if we have more than one cpu
+ *
+ * \param de_ctx pointer to the Detection Engine
+ * \param nfqid pointer to the netfilter queue id
+ * \retval 0 if all goes well. (If any problem is detected the engine will
+ *           exit())
+ */
+int RunModeIpsNFQAuto(DetectEngineCtx *de_ctx, char *nfq_id) {
+    SCEnter();
+#ifdef NFQ
+    char tname[16];
+    TmModule *tm_module ;
+    int cur_queue = 0;
+
+    /* Available cpus */
+    uint16_t ncpus = UtilCpuGetNumProcessorsOnline();
+    int nqueue = NFQGetQueueCount();
+
+    RunModeInitialize();
+
+    TimeModeSetLive();
+
+    for (int i = 0; i < nqueue; i++) {
+    /* create the threads */
+        cur_queue = NFQGetQueueNum(i);
+        if (cur_queue == -1) {
+            printf("ERROR: Invalid thread number\n");
+            exit(EXIT_FAILURE);
+        }
+        memset(tname, 0, sizeof(tname));
+        snprintf(tname, sizeof(tname),"RecvNFQ-Q%"PRIu16, cur_queue);
+        if (tname == NULL) {
+            printf("ERROR: Unable to build thread name\n");
+            exit(EXIT_FAILURE);
+        }
+
+        char *thread_name = SCStrdup(tname);
+        ThreadVars *tv_receivenfq = TmThreadCreatePacketHandler(thread_name,
+                "packetpool","packetpool","pickup-queue","simple","1slot_noinout");
+        if (tv_receivenfq == NULL) {
+            printf("ERROR: TmThreadsCreate failed\n");
+            exit(EXIT_FAILURE);
+        }
+        tm_module = TmModuleGetByName("ReceiveNFQ");
+        if (tm_module == NULL) {
+            printf("ERROR: TmModuleGetByName failed for ReceiveNFQ\n");
+            exit(EXIT_FAILURE);
+        }
+
+        Tm1SlotSetFunc(tv_receivenfq,tm_module, (void *) NFQGetThread(i));
+
+        TmThreadSetCPU(tv_receivenfq, RECEIVE_CPU_SET);
+
+        if (TmThreadSpawn(tv_receivenfq) != TM_ECODE_OK) {
+            printf("ERROR: TmThreadSpawn failed\n");
+            exit(EXIT_FAILURE);
+        }
+    }
+
+    /* decode and stream */
+    ThreadVars *tv_decode = TmThreadCreatePacketHandler("Decode1",
+            "pickup-queue","simple","decode-queue","simple","varslot");
+    if (tv_decode == NULL) {
+        printf("ERROR: TmThreadsCreate failed for Decode1\n");
+        exit(EXIT_FAILURE);
+    }
+
+    tm_module = TmModuleGetByName("DecodeNFQ");
+    if (tm_module == NULL) {
+        printf("ERROR: TmModuleGetByName DecodeNFQ failed\n");
+        exit(EXIT_FAILURE);
+    }
+    TmVarSlotSetFuncAppend(tv_decode,tm_module,NULL);
+
+    tm_module = TmModuleGetByName("StreamTcp");
+    if (tm_module == NULL) {
+        printf("ERROR: TmModuleGetByName StreamTcp failed\n");
+        exit(EXIT_FAILURE);
+    }
+    TmVarSlotSetFuncAppend(tv_decode,tm_module,NULL);
+
+    TmThreadSetCPU(tv_decode, DECODE_CPU_SET);
+
+    if (TmThreadSpawn(tv_decode) != TM_ECODE_OK) {
+        printf("ERROR: TmThreadSpawn failed\n");
+        exit(EXIT_FAILURE);
+    }
+
+    /* always create at least one thread */
+    int thread_max = TmThreadGetNbThreads(DETECT_CPU_SET);
+    if (thread_max == 0)
+        thread_max = ncpus * threading_detect_ratio;
+    if (thread_max < 1)
+        thread_max = 1;
+
+    int thread;
+    for (thread = 0; thread < thread_max; thread++) {
+        memset(tname, 0, sizeof(tname));
+        snprintf(tname, sizeof(tname),"Detect%"PRIu16, thread+1);
+        if (tname == NULL)
+            break;
+
+        char *thread_name = SCStrdup(tname);
+        SCLogDebug("Assigning %s affinity", thread_name);
+
+        ThreadVars *tv_detect_ncpu = TmThreadCreatePacketHandler(thread_name,
+                "decode-queue","simple","verdict-queue","simple","1slot");
+        if (tv_detect_ncpu == NULL) {
+            printf("ERROR: TmThreadsCreate failed\n");
+            exit(EXIT_FAILURE);
+        }
+        tm_module = TmModuleGetByName("Detect");
+        if (tm_module == NULL) {
+            printf("ERROR: TmModuleGetByName Detect failed\n");
+            exit(EXIT_FAILURE);
+        }
+        Tm1SlotSetFunc(tv_detect_ncpu,tm_module,(void *)de_ctx);
+
+        TmThreadSetCPU(tv_detect_ncpu, DETECT_CPU_SET);
+
+        char *thread_group_name = SCStrdup("Detect");
+        if (thread_group_name == NULL) {
+            printf("Error allocating memory\n");
+            exit(EXIT_FAILURE);
+        }
+        tv_detect_ncpu->thread_group_name = thread_group_name;
+
+        if (TmThreadSpawn(tv_detect_ncpu) != TM_ECODE_OK) {
+            printf("ERROR: TmThreadSpawn failed\n");
+            exit(EXIT_FAILURE);
+        }
+    }
+
+    /* create the threads */
+    for (int i = 0; i < nqueue; i++) {
+        memset(tname, 0, sizeof(tname));
+        snprintf(tname, sizeof(tname),"VerdictNFQ%"PRIu16, i);
+        if (tname == NULL) {
+            printf("ERROR: Unable to build thread name\n");
+            exit(EXIT_FAILURE);
+        }
+
+        char *thread_name = SCStrdup(tname);
+        ThreadVars *tv_verdict = TmThreadCreatePacketHandler(thread_name,
+                 "verdict-queue","simple","alert-queue","simple","varslot");
+        if (tv_verdict == NULL) {
+            printf("ERROR: TmThreadsCreate failed\n");
+            exit(EXIT_FAILURE);
+        }
+        tm_module = TmModuleGetByName("VerdictNFQ");
+        if (tm_module == NULL) {
+            printf("ERROR: TmModuleGetByName VerdictNFQ failed\n");
+            exit(EXIT_FAILURE);
+        }
+        TmVarSlotSetFuncAppend(tv_verdict,tm_module, (void *)NFQGetThread(i));
+
+        tm_module = TmModuleGetByName("RespondReject");
+        if (tm_module == NULL) {
+            printf("ERROR: TmModuleGetByName for RespondReject failed\n");
+            exit(EXIT_FAILURE);
+        }
+        TmVarSlotSetFuncAppend(tv_verdict,tm_module,NULL);
+
+        TmThreadSetCPU(tv_verdict, VERDICT_CPU_SET);
+
+        if (TmThreadSpawn(tv_verdict) != TM_ECODE_OK) {
+            printf("ERROR: TmThreadSpawn failed\n");
+            exit(EXIT_FAILURE);
+        }
+    };
+
+    ThreadVars *tv_outputs = TmThreadCreatePacketHandler("Outputs",
+        "alert-queue", "simple", "packetpool", "packetpool", "varslot");
+
+    TmThreadSetCPU(tv_outputs, OUTPUT_CPU_SET);
+
+    SetupOutputs(tv_outputs);
+    if (TmThreadSpawn(tv_outputs) != TM_ECODE_OK) {
+        printf("ERROR: TmThreadSpawn failed\n");
+        exit(EXIT_FAILURE);
+    }
+
+#endif /* NFQ */
+    return 0;
+}
diff --git a/src/runmode-nfq.h b/src/runmode-nfq.h
new file mode 100644
index 0000000000..453ae759c1
--- /dev/null
+++ b/src/runmode-nfq.h
@@ -0,0 +1,28 @@
+/* Copyright (C) 2007-2010 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program 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
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+/** \file
+ *
+ *  \author Victor Julien <victor@inliniac.net>
+ */
+
+#ifndef __RUNMODE_NFQ_H__
+#define __RUNMODE_NFQ_H__
+
+int RunModeIpsNFQAuto(DetectEngineCtx *, char *);
+
+#endif /* __RUNMODE_NFQ_H__ */
diff --git a/src/runmodes.c b/src/runmodes.c
index 43b16d715d..f6dc9ce27c 100644
--- a/src/runmodes.c
+++ b/src/runmodes.c
@@ -177,156 +177,6 @@ void RunModeInitialize(void)
     SCLogDebug("threading_detect_ratio %f", threading_detect_ratio);
 }
 
-int RunModeIpsNFQ(DetectEngineCtx *de_ctx, char *nfq_id) {
-    TimeModeSetLive();
-
-    char *thread_group_name = NULL;
-
-    /* create the threads */
-    ThreadVars *tv_receivenfq = TmThreadCreatePacketHandler("ReceiveNFQ","packetpool","packetpool","pickup-queue","simple","1slot_noinout");
-    if (tv_receivenfq == NULL) {
-        printf("ERROR: TmThreadsCreate failed\n");
-        exit(EXIT_FAILURE);
-    }
-    TmModule *tm_module = TmModuleGetByName("ReceiveNFQ");
-    if (tm_module == NULL) {
-        printf("ERROR: TmModuleGetByName failed for ReceiveNFQ\n");
-        exit(EXIT_FAILURE);
-    }
-    Tm1SlotSetFunc(tv_receivenfq,tm_module,nfq_id);
-
-    if (TmThreadSpawn(tv_receivenfq) != TM_ECODE_OK) {
-        printf("ERROR: TmThreadSpawn failed\n");
-        exit(EXIT_FAILURE);
-    }
-
-    ThreadVars *tv_decode1 = TmThreadCreatePacketHandler("Decode1","pickup-queue","simple","decode-queue1","simple","1slot");
-    if (tv_decode1 == NULL) {
-        printf("ERROR: TmThreadsCreate failed for Decode1\n");
-        exit(EXIT_FAILURE);
-    }
-    tm_module = TmModuleGetByName("DecodeNFQ");
-    if (tm_module == NULL) {
-        printf("ERROR: TmModuleGetByName DecodeNFQ failed\n");
-        exit(EXIT_FAILURE);
-    }
-    Tm1SlotSetFunc(tv_decode1,tm_module,NULL);
-
-    if (TmThreadSpawn(tv_decode1) != TM_ECODE_OK) {
-        printf("ERROR: TmThreadSpawn failed\n");
-        exit(EXIT_FAILURE);
-    }
-
-    ThreadVars *tv_stream1 = TmThreadCreatePacketHandler("Stream1","decode-queue1","simple","stream-queue1","simple","1slot");
-    if (tv_stream1 == NULL) {
-        printf("ERROR: TmThreadsCreate failed for Stream1\n");
-        exit(EXIT_FAILURE);
-    }
-    tm_module = TmModuleGetByName("StreamTcp");
-    if (tm_module == NULL) {
-        printf("ERROR: TmModuleGetByName StreamTcp failed\n");
-        exit(EXIT_FAILURE);
-    }
-    Tm1SlotSetFunc(tv_stream1,tm_module,NULL);
-
-    if (TmThreadSpawn(tv_stream1) != TM_ECODE_OK) {
-        printf("ERROR: TmThreadSpawn failed\n");
-        exit(EXIT_FAILURE);
-    }
-
-    ThreadVars *tv_detect1 = TmThreadCreatePacketHandler("Detect1","stream-queue1","simple","verdict-queue","simple","1slot");
-    if (tv_detect1 == NULL) {
-        printf("ERROR: TmThreadsCreate failed\n");
-        exit(EXIT_FAILURE);
-    }
-    tm_module = TmModuleGetByName("Detect");
-    if (tm_module == NULL) {
-        printf("ERROR: TmModuleGetByName Detect failed\n");
-        exit(EXIT_FAILURE);
-    }
-    Tm1SlotSetFunc(tv_detect1,tm_module,(void *)de_ctx);
-
-    thread_group_name = SCStrdup("Detect");
-    if (thread_group_name == NULL) {
-        printf("Error allocating memory\n");
-        exit(EXIT_FAILURE);
-    }
-    tv_detect1->thread_group_name = thread_group_name;
-
-    if (TmThreadSpawn(tv_detect1) != TM_ECODE_OK) {
-        printf("ERROR: TmThreadSpawn failed\n");
-        exit(EXIT_FAILURE);
-    }
-
-    ThreadVars *tv_detect2 = TmThreadCreatePacketHandler("Detect2","stream-queue1","simple","verdict-queue","simple","1slot");
-    if (tv_detect2 == NULL) {
-        printf("ERROR: TmThreadsCreate failed\n");
-        exit(EXIT_FAILURE);
-    }
-    tm_module = TmModuleGetByName("Detect");
-    if (tm_module == NULL) {
-        printf("ERROR: TmModuleGetByName Detect failed\n");
-        exit(EXIT_FAILURE);
-    }
-    Tm1SlotSetFunc(tv_detect2,tm_module,(void *)de_ctx);
-
-    thread_group_name = SCStrdup("Detect");
-    if (thread_group_name == NULL) {
-        printf("Error allocating memory\n");
-        exit(EXIT_FAILURE);
-    }
-    tv_detect2->thread_group_name = thread_group_name;
-
-    if (TmThreadSpawn(tv_detect2) != TM_ECODE_OK) {
-        printf("ERROR: TmThreadSpawn failed\n");
-        exit(EXIT_FAILURE);
-    }
-
-    ThreadVars *tv_verdict = TmThreadCreatePacketHandler("Verdict","verdict-queue","simple","respond-queue","simple","1slot");
-    if (tv_verdict == NULL) {
-        printf("ERROR: TmThreadsCreate failed\n");
-        exit(EXIT_FAILURE);
-    }
-    tm_module = TmModuleGetByName("VerdictNFQ");
-    if (tm_module == NULL) {
-        printf("ERROR: TmModuleGetByName VerdictNFQ failed\n");
-        exit(EXIT_FAILURE);
-    }
-    Tm1SlotSetFunc(tv_verdict,tm_module,nfq_id);
-
-    if (TmThreadSpawn(tv_verdict) != TM_ECODE_OK) {
-        printf("ERROR: TmThreadSpawn failed\n");
-        exit(EXIT_FAILURE);
-    }
-
-    ThreadVars *tv_rreject = TmThreadCreatePacketHandler("RespondReject","respond-queue","simple","alert-queue1","simple","1slot");
-    if (tv_rreject == NULL) {
-        printf("ERROR: TmThreadsCreate failed\n");
-        exit(EXIT_FAILURE);
-    }
-    tm_module = TmModuleGetByName("RespondReject");
-    if (tm_module == NULL) {
-        printf("ERROR: TmModuleGetByName for RespondReject failed\n");
-        exit(EXIT_FAILURE);
-    }
-    Tm1SlotSetFunc(tv_rreject,tm_module,NULL);
-
-    if (TmThreadSpawn(tv_rreject) != TM_ECODE_OK) {
-        printf("ERROR: TmThreadSpawn failed\n");
-        exit(EXIT_FAILURE);
-    }
-
-    ThreadVars *tv_outputs = TmThreadCreatePacketHandler("Outputs",
-        "alert-queue1", "simple", "packetpool", "packetpool", "varslot");
-    SetupOutputs(tv_outputs);
-    if (TmThreadSpawn(tv_outputs) != TM_ECODE_OK) {
-        printf("ERROR: TmThreadSpawn failed\n");
-        exit(EXIT_FAILURE);
-    }
-
-    return 0;
-}
-
 int RunModeIpsIPFW(DetectEngineCtx *de_ctx) {
 
     TimeModeSetLive();
@@ -707,204 +557,6 @@ int RunModeIpsIPFWAuto(DetectEngineCtx *de_ctx) {
     return 0;
 }
 
-/**
- * \brief RunModeIpsNFQAuto set up the following thread packet handlers:
- *        - Receive thread (from NFQ)
- *        - Decode thread
- *        - Stream thread
- *        - Detect: If we have only 1 cpu, it will setup one Detect thread
- *                  If we have more than one, it will setup num_cpus - 1
- *                  starting from the second cpu available.
- *        - Veredict thread (NFQ)
- *        - Respond/Reject thread
- *        - Outputs thread
- *        By default the threads will use the first cpu available
- *        except the Detection threads if we have more than one cpu
- *
- * \param de_ctx pointer to the Detection Engine
- * \param nfqid pointer to the netfilter queue id
- * \retval 0 if all goes well. (If any problem is detected the engine will
- *           exit())
- */
-int RunModeIpsNFQAuto(DetectEngineCtx *de_ctx, char *nfq_id) {
-    SCEnter();
-#ifdef NFQ
-    char tname[16];
-    TmModule *tm_module ;
-    int cur_queue = 0;
-
-    /* Available cpus */
-    uint16_t ncpus = UtilCpuGetNumProcessorsOnline();
-    int nqueue = NFQGetQueueCount();
-
-    RunModeInitialize();
-
-    TimeModeSetLive();
-
-    for (int i = 0; i < nqueue; i++) {
-    /* create the threads */
-        cur_queue = NFQGetQueueNum(i);
-        if (cur_queue == -1) {
-            printf("ERROR: Invalid thread number\n");
-            exit(EXIT_FAILURE);
-        }
-        memset(tname, 0, sizeof(tname));
-        snprintf(tname, sizeof(tname),"RecvNFQ-Q%"PRIu16, cur_queue);
-        if (tname == NULL) {
-            printf("ERROR: Unable to build thread name\n");
-            exit(EXIT_FAILURE);
-        }
-
-        char *thread_name = SCStrdup(tname);
-        ThreadVars *tv_receivenfq = TmThreadCreatePacketHandler(thread_name,
-                "packetpool","packetpool","pickup-queue","simple","1slot_noinout");
-        if (tv_receivenfq == NULL) {
-            printf("ERROR: TmThreadsCreate failed\n");
-            exit(EXIT_FAILURE);
-        }
-        tm_module = TmModuleGetByName("ReceiveNFQ");
-        if (tm_module == NULL) {
-            printf("ERROR: TmModuleGetByName failed for ReceiveNFQ\n");
-            exit(EXIT_FAILURE);
-        }
-
-        Tm1SlotSetFunc(tv_receivenfq,tm_module, (void *) NFQGetThread(i));
-
-        TmThreadSetCPU(tv_receivenfq, RECEIVE_CPU_SET);
-
-        if (TmThreadSpawn(tv_receivenfq) != TM_ECODE_OK) {
-            printf("ERROR: TmThreadSpawn failed\n");
-            exit(EXIT_FAILURE);
-        }
-    }
-
-    /* decode and stream */
-    ThreadVars *tv_decode = TmThreadCreatePacketHandler("Decode1",
-            "pickup-queue","simple","decode-queue","simple","varslot");
-    if (tv_decode == NULL) {
-        printf("ERROR: TmThreadsCreate failed for Decode1\n");
-        exit(EXIT_FAILURE);
-    }
-
-    tm_module = TmModuleGetByName("DecodeNFQ");
-    if (tm_module == NULL) {
-        printf("ERROR: TmModuleGetByName DecodeNFQ failed\n");
-        exit(EXIT_FAILURE);
-    }
-    TmVarSlotSetFuncAppend(tv_decode,tm_module,NULL);
-
-    tm_module = TmModuleGetByName("StreamTcp");
-    if (tm_module == NULL) {
-        printf("ERROR: TmModuleGetByName StreamTcp failed\n");
-        exit(EXIT_FAILURE);
-    }
-    TmVarSlotSetFuncAppend(tv_decode,tm_module,NULL);
-
-    TmThreadSetCPU(tv_decode, DECODE_CPU_SET);
-
-    if (TmThreadSpawn(tv_decode) != TM_ECODE_OK) {
-        printf("ERROR: TmThreadSpawn failed\n");
-        exit(EXIT_FAILURE);
-    }
-
-    /* always create at least one thread */
-    int thread_max = TmThreadGetNbThreads(DETECT_CPU_SET);
-    if (thread_max == 0)
-        thread_max = ncpus * threading_detect_ratio;
-    if (thread_max < 1)
-        thread_max = 1;
-
-    int thread;
-    for (thread = 0; thread < thread_max; thread++) {
-        memset(tname, 0, sizeof(tname));
-        snprintf(tname, sizeof(tname),"Detect%"PRIu16, thread+1);
-        if (tname == NULL)
-            break;
-
-        char *thread_name = SCStrdup(tname);
-        SCLogDebug("Assigning %s affinity", thread_name);
-
-        ThreadVars *tv_detect_ncpu = TmThreadCreatePacketHandler(thread_name,
-                "decode-queue","simple","verdict-queue","simple","1slot");
-        if (tv_detect_ncpu == NULL) {
-            printf("ERROR: TmThreadsCreate failed\n");
-            exit(EXIT_FAILURE);
-        }
-        tm_module = TmModuleGetByName("Detect");
-        if (tm_module == NULL) {
-            printf("ERROR: TmModuleGetByName Detect failed\n");
-            exit(EXIT_FAILURE);
-        }
-        Tm1SlotSetFunc(tv_detect_ncpu,tm_module,(void *)de_ctx);
-
-        TmThreadSetCPU(tv_detect_ncpu, DETECT_CPU_SET);
-
-        char *thread_group_name = SCStrdup("Detect");
-        if (thread_group_name == NULL) {
-            printf("Error allocating memory\n");
-            exit(EXIT_FAILURE);
-        }
-        tv_detect_ncpu->thread_group_name = thread_group_name;
-
-        if (TmThreadSpawn(tv_detect_ncpu) != TM_ECODE_OK) {
-            printf("ERROR: TmThreadSpawn failed\n");
-            exit(EXIT_FAILURE);
-        }
-    }
-
-    /* create the threads */
-    for (int i = 0; i < nqueue; i++) {
-        memset(tname, 0, sizeof(tname));
-        snprintf(tname, sizeof(tname),"VerdictNFQ%"PRIu16, i);
-        if (tname == NULL) {
-            printf("ERROR: Unable to build thread name\n");
-            exit(EXIT_FAILURE);
-        }
-
-        char *thread_name = SCStrdup(tname);
-        ThreadVars *tv_verdict = TmThreadCreatePacketHandler(thread_name,
-                 "verdict-queue","simple","alert-queue","simple","varslot");
-        if (tv_verdict == NULL) {
-            printf("ERROR: TmThreadsCreate failed\n");
-            exit(EXIT_FAILURE);
-        }
-        tm_module = TmModuleGetByName("VerdictNFQ");
-        if (tm_module == NULL) {
-            printf("ERROR: TmModuleGetByName VerdictNFQ failed\n");
-            exit(EXIT_FAILURE);
-        }
-        TmVarSlotSetFuncAppend(tv_verdict,tm_module, (void *)NFQGetThread(i));
-
-        tm_module = TmModuleGetByName("RespondReject");
-        if (tm_module == NULL) {
-            printf("ERROR: TmModuleGetByName for RespondReject failed\n");
-            exit(EXIT_FAILURE);
-        }
-        TmVarSlotSetFuncAppend(tv_verdict,tm_module,NULL);
-
-        TmThreadSetCPU(tv_verdict, VERDICT_CPU_SET);
-
-        if (TmThreadSpawn(tv_verdict) != TM_ECODE_OK) {
-            printf("ERROR: TmThreadSpawn failed\n");
-            exit(EXIT_FAILURE);
-        }
-    };
-
-    ThreadVars *tv_outputs = TmThreadCreatePacketHandler("Outputs",
-        "alert-queue", "simple", "packetpool", "packetpool", "varslot");
-
-    TmThreadSetCPU(tv_outputs, OUTPUT_CPU_SET);
-
-    SetupOutputs(tv_outputs);
-    if (TmThreadSpawn(tv_outputs) != TM_ECODE_OK) {
-        printf("ERROR: TmThreadSpawn failed\n");
-        exit(EXIT_FAILURE);
-    }
-
-#endif /* NFQ */
-    return 0;
-}
-
 int RunModeErfFileAuto(DetectEngineCtx *de_ctx, char *file)
 {
     SCEnter();
diff --git a/src/runmodes.h b/src/runmodes.h
index 048a2fd6a2..1c84a340bb 100644
--- a/src/runmodes.h
+++ b/src/runmodes.h
@@ -30,9 +30,7 @@ void SetupOutputs(ThreadVars *);
 #include "runmode-pcap.h"
 #include "runmode-pcap-file.h"
 #include "runmode-pfring.h"
-
-int RunModeIpsNFQ(DetectEngineCtx *, char *);
-int RunModeIpsNFQAuto(DetectEngineCtx *, char *);
+#include "runmode-nfq.h"
 
 int RunModeIpsIPFW(DetectEngineCtx *);
 int RunModeIpsIPFWAuto(DetectEngineCtx *);