diff --git a/src/decode.h b/src/decode.h
index 510a7960e5d6..f36c41a8422e 100644
--- a/src/decode.h
+++ b/src/decode.h
@@ -103,8 +103,6 @@ struct PktPool_;
 /* declare these here as they are called from the
  * PACKET_RECYCLE and PACKET_CLEANUP macro's. */
 typedef struct AppLayerDecoderEvents_ AppLayerDecoderEvents;
-void AppLayerDecoderEventsResetEvents(AppLayerDecoderEvents *events);
-void AppLayerDecoderEventsFreeEvents(AppLayerDecoderEvents **events);
 
 /* Address */
 typedef struct Address_ {
diff --git a/src/detect-engine-frame.h b/src/detect-engine-frame.h
index a529e55c4d00..062d57d2b330 100644
--- a/src/detect-engine-frame.h
+++ b/src/detect-engine-frame.h
@@ -29,8 +29,6 @@ void DetectRunPrefilterFrame(DetectEngineThreadCtx *det_ctx, const SigGroupHead
 bool DetectRunFrameInspectRule(ThreadVars *tv, DetectEngineThreadCtx *det_ctx, const Signature *s,
         Flow *f, Packet *p, const Frames *frames, const Frame *frame);
 
-int PrefilterGenericMpmFrameRegister(DetectEngineCtx *de_ctx, SigGroupHead *sgh, MpmCtx *mpm_ctx,
-        const DetectBufferMpmRegistry *mpm_reg, int list_id);
 int DetectEngineInspectFrameBufferGeneric(DetectEngineThreadCtx *det_ctx,
         const DetectEngineFrameInspectionEngine *engine, const Signature *s, Packet *p,
         const Frames *frames, const Frame *frame);
diff --git a/src/detect-engine-mpm.h b/src/detect-engine-mpm.h
index 16195414042b..10bdb86f5bcb 100644
--- a/src/detect-engine-mpm.h
+++ b/src/detect-engine-mpm.h
@@ -113,8 +113,6 @@ void DetectEngineFrameMpmRegister(DetectEngineCtx *de_ctx, const char *name, int
                 const DetectBufferMpmRegistry *mpm_reg, int list_id),
         AppProto alproto, uint8_t type);
 
-int PrefilterGenericMpmPktRegister(DetectEngineCtx *de_ctx, SigGroupHead *sgh, MpmCtx *mpm_ctx,
-        const DetectBufferMpmRegistry *mpm_reg, int list_id);
 
 int PrefilterGenericMpmFrameRegister(DetectEngineCtx *de_ctx, SigGroupHead *sgh, MpmCtx *mpm_ctx,
         const DetectBufferMpmRegistry *mpm_reg, int list_id);
diff --git a/src/detect-icmpv4hdr.c b/src/detect-icmpv4hdr.c
index 259fbdc2ecc6..dbda7c6f14d1 100644
--- a/src/detect-icmpv4hdr.c
+++ b/src/detect-icmpv4hdr.c
@@ -28,6 +28,7 @@
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "detect-icmpv4hdr.h"
+#include "detect-engine-prefilter.h"
 
 /* prototypes */
 static int DetectIcmpv4HdrSetup(DetectEngineCtx *, Signature *, const char *);
diff --git a/src/packet.c b/src/packet.c
index bd63de756835..cb6dcf618380 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -22,6 +22,7 @@
 #include "util-profiling.h"
 #include "util-validate.h"
 #include "action-globals.h"
+#include "app-layer-events.h"
 
 /** \brief issue drop action
  *