From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Fri, 13 Nov 2015 18:25:26 +0000 (-0500)
Subject: Merge pull request #131 in SNORT/snort3 from ~JOCORNET/snort3:rearrange_time_dir... 
X-Git-Tag: 3.0.0-233~730^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd51e8b;p=thirdparty%2Fsnort3.git

Merge pull request #131 in SNORT/snort3 from ~JOCORNET/snort3:rearrange_time_dir to master

Squashed commit of the following:

commit 9a2fb92580e29b331a85a1ad97a117f134b54c80
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Nov 12 17:23:46 2015 -0500

    added include

commit b4e5a52f19c70958223919c6aa18e8d533b60305
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Nov 12 17:05:20 2015 -0500

    further cleanup

commit 9069e256c3d50c4e3dfa95d288bc7a95d3dc333f
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Nov 12 16:53:13 2015 -0500

    added forward declarations for profilestats

commit 86a6864733ff5fd1a40931b6a7ae92619b6f292d
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Nov 12 16:38:14 2015 -0500

    moved profiler to its own directory

commit 3660246db180aa0048ac9a55fe43e05947857c9f
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Nov 12 16:13:32 2015 -0500

    moved ppm to its own directory
---

diff --git a/configure.ac b/configure.ac
index 23b8af070..bd8e73d20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -343,7 +343,10 @@ AC_ARG_ENABLE(ppm,
     AC_HELP_STRING([--enable-ppm],[enable packet/rule performance monitor]),
     enable_ppm="$enableval", enable_ppm="no")
 
+AM_CONDITIONAL(PPM_MGR, test "x$enable_ppm" = "xyes")
+
 if test "x$enable_ppm" = "xyes"; then
+    CPPFLAGS="$CPPFLAGS -DPPM_MGR"
     AC_DEFINE(PPM_MGR, [1], [build ppm manager])
 fi
 
@@ -1031,6 +1034,8 @@ src/sfrt/Makefile \
 src/target_based/Makefile \
 src/catch/Makefile \
 src/time/Makefile \
+src/ppm/Makefile \
+src/profiler/Makefile \
 src/utils/Makefile \
 src/utils/test/Makefile \
 lua/Makefile \
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a5d45f22d..aa0aae10b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -74,6 +74,14 @@ if (BUILD_PIGLET)
     add_subdirectory(piglet_plugins)
 endif (BUILD_PIGLET)
 
+if (ENABLE_PPM)
+    set(PPM_LIBRARIES ppm)
+    add_subdirectory(ppm)
+endif (ENABLE_PPM)
+
+if (ENABLE_PERFPROFILING)
+    set(PERFPROFILING_LIBRARIES profiler)
+endif (ENABLE_PERFPROFILING)
 
 #  The main Snort executableRA
 add_executable( snort
@@ -124,6 +132,8 @@ target_link_libraries( snort
     detection
     framework
     time
+    ${PPM_LIBRARIES}
+    ${PERFPROFILING_LIBRARIES}
     ips_actions
     events
     hash
@@ -164,6 +174,7 @@ add_subdirectory(service_inspectors)
 add_subdirectory(stream)
 add_subdirectory(target_based)
 add_subdirectory(time)
+add_subdirectory(profiler)
 add_subdirectory(utils)
 add_subdirectory(helpers)
 add_subdirectory(lua)
diff --git a/src/Makefile.am b/src/Makefile.am
index 91bc097c4..468d65d12 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,6 +36,14 @@ piglet/libpiglet.a \
 piglet_plugins/libpiglet_plugins.a
 endif
 
+if PPM_MGR
+ppm_list = ppm/libppm.a
+endif
+
+if PERF_PROFILING
+profiler_list = profiler/libprofiler.a
+endif
+
 snort_LDFLAGS = -export-dynamic
 
 # order libs to avoid undefined symbols
@@ -85,6 +93,8 @@ filters/libfilter.a \
 detection/libdetection.a \
 framework/libframework.a \
 time/libtime.a \
+$(ppm_list) \
+$(profiler_list) \
 actions/libips_actions.a \
 events/libevents.a \
 hash/libhash.a \
@@ -131,6 +141,7 @@ sfrt \
 stream \
 target_based \
 time \
+profiler \
 utils
 
 if BUILD_UNIT_TESTS
@@ -141,3 +152,6 @@ if BUILD_PIGLET
 SUBDIRS += piglet piglet_plugins
 endif
 
+if PPM_MGR
+SUBDIRS += ppm
+endif
diff --git a/src/actions/act_react.cc b/src/actions/act_react.cc
index 8506c14d3..69d0fb2c3 100644
--- a/src/actions/act_react.cc
+++ b/src/actions/act_react.cc
@@ -54,7 +54,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "packet_io/active.h"
 #include "parser/parser.h"
 #include "framework/ips_action.h"
diff --git a/src/actions/act_reject.cc b/src/actions/act_reject.cc
index e31eacf37..33eb4e4cf 100644
--- a/src/actions/act_reject.cc
+++ b/src/actions/act_reject.cc
@@ -51,7 +51,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "packet_io/active.h"
 #include "utils/util.h"
 #include "framework/ips_action.h"
diff --git a/src/detection/detect.cc b/src/detection/detect.cc
index a72023172..734f7a7e9 100644
--- a/src/detection/detect.cc
+++ b/src/detection/detect.cc
@@ -53,8 +53,8 @@
 #include "events/event_wrapper.h"
 #include "events/event_queue.h"
 #include "log/obfuscation.h"
-#include "time/profiler.h"
-#include "time/ppm.h"
+#include "profiler/profiler.h"
+#include "ppm/ppm.h"
 #include "stream/stream_api.h"
 #include "packet_io/active.h"
 #include "managers/inspector_manager.h"
diff --git a/src/detection/detect.h b/src/detection/detect.h
index c8056dfdf..5b7a75ee0 100644
--- a/src/detection/detect.h
+++ b/src/detection/detect.h
@@ -31,7 +31,6 @@
 #include "detection/rules.h"
 #include "detection/treenodes.h"
 #include "parser/parser.h"
-#include "time/profiler.h"
 #include "log/log.h"
 #include "events/event.h"
 
@@ -39,6 +38,7 @@ extern SO_PUBLIC THREAD_LOCAL int do_detect;
 extern SO_PUBLIC THREAD_LOCAL int do_detect_content;
 
 #ifdef PERF_PROFILING
+struct ProfileStats;
 extern THREAD_LOCAL ProfileStats eventqPerfStats;
 extern THREAD_LOCAL ProfileStats detectPerfStats;
 extern THREAD_LOCAL ProfileStats rebuiltPacketPerfStats;
diff --git a/src/detection/detection_options.cc b/src/detection/detection_options.cc
index ca4d1d131..c1df6a9b9 100644
--- a/src/detection/detection_options.cc
+++ b/src/detection/detection_options.cc
@@ -39,8 +39,8 @@
 #include "fp_detect.h"
 #include "rules.h"
 
-#include "time/ppm.h"
-#include "time/profiler.h"
+#include "ppm/ppm.h"
+#include "profiler/profiler.h"
 #include "utils/util.h"
 #include "hash/sfxhash.h"
 #include "hash/sfhashfcn.h"
diff --git a/src/detection/fp_detect.cc b/src/detection/fp_detect.cc
index 96136aeb4..35b4c8aa9 100644
--- a/src/detection/fp_detect.cc
+++ b/src/detection/fp_detect.cc
@@ -67,7 +67,8 @@
 #include "stream/stream_api.h"
 #include "utils/sflsq.h"
 #include "utils/util.h"
-#include "time/ppm.h"
+#include "ppm/ppm.h"
+#include "profiler/profiler.h"
 #include "actions/actions.h"
 #include "sfip/sf_ip.h"
 #include "managers/action_manager.h"
diff --git a/src/detection/fp_detect.h b/src/detection/fp_detect.h
index e92a56b90..477bee25e 100644
--- a/src/detection/fp_detect.h
+++ b/src/detection/fp_detect.h
@@ -36,12 +36,12 @@
 #include "detection/fp_create.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
 #include "utils/sflsq.h"
 
 #define REBUILD_FLAGS (PKT_REBUILT_FRAG | PKT_REBUILT_STREAM)
 
 #ifdef PERF_PROFILING
+struct ProfileStats;
 extern THREAD_LOCAL ProfileStats rulePerfStats;
 extern THREAD_LOCAL ProfileStats ruleRTNEvalPerfStats;
 extern THREAD_LOCAL ProfileStats ruleOTNEvalPerfStats;
diff --git a/src/framework/mpse.cc b/src/framework/mpse.cc
index a5bf46965..c506f98f3 100644
--- a/src/framework/mpse.cc
+++ b/src/framework/mpse.cc
@@ -26,6 +26,7 @@ using namespace std;
 
 #include "main/snort_debug.h"
 #include "main/snort_types.h"
+#include "profiler/profiler.h"
 
 // this is accumulated only for fast pattern
 // searches for the detection engine
diff --git a/src/framework/mpse.h b/src/framework/mpse.h
index 7faddf7aa..cfd44b52f 100644
--- a/src/framework/mpse.h
+++ b/src/framework/mpse.h
@@ -33,7 +33,6 @@
 #include "main/snort_types.h"
 #include "main/thread.h"
 #include "framework/base_api.h"
-#include "time/profiler.h"
 
 /*
 *   Move these defines to a generic Win32/Unix compatability file,
@@ -101,6 +100,7 @@ private:
 };
 
 #ifdef PERF_PROFILING
+struct ProfileStats;
 extern THREAD_LOCAL ProfileStats mpsePerfStats;
 #endif
 
diff --git a/src/helpers/chunk.cc b/src/helpers/chunk.cc
index 344044ee7..db8b7598b 100644
--- a/src/helpers/chunk.cc
+++ b/src/helpers/chunk.cc
@@ -25,7 +25,7 @@
 #include "hash/sfhashfcn.h"
 #include "parser/parser.h"
 #include "framework/cursor.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "lua/lua.h"
 
 #ifdef UNIT_TEST
diff --git a/src/ips_options/ips_ack.cc b/src/ips_options/ips_ack.cc
index e7b00b392..e9025567f 100644
--- a/src/ips_options/ips_ack.cc
+++ b/src/ips_options/ips_ack.cc
@@ -31,7 +31,7 @@
 #include "protocols/packet.h"
 #include "parser/parser.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
diff --git a/src/ips_options/ips_asn1.cc b/src/ips_options/ips_asn1.cc
index 43b9838f2..cb184add1 100644
--- a/src/ips_options/ips_asn1.cc
+++ b/src/ips_options/ips_asn1.cc
@@ -71,7 +71,7 @@
 #include "detection/treenodes.h"
 #include "detection/detection_util.h"
 #include "detection/detection_defines.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/cursor.h"
 #include "framework/ips_option.h"
 #include "framework/parameter.h"
diff --git a/src/ips_options/ips_base64.cc b/src/ips_options/ips_base64.cc
index 46030762b..7f43485c5 100644
--- a/src/ips_options/ips_base64.cc
+++ b/src/ips_options/ips_base64.cc
@@ -32,7 +32,7 @@
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
 #include "parser/parser.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "utils/util.h"
 #include "mime/decode_b64.h"
 #include "utils/util_unfold.h"
diff --git a/src/ips_options/ips_bufferlen.cc b/src/ips_options/ips_bufferlen.cc
index 81e055b13..4e31d4ecc 100644
--- a/src/ips_options/ips_bufferlen.cc
+++ b/src/ips_options/ips_bufferlen.cc
@@ -27,7 +27,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 #include "framework/range.h"
 #include "framework/ips_option.h"
diff --git a/src/ips_options/ips_byte_extract.cc b/src/ips_options/ips_byte_extract.cc
index 8558a992b..d210102c2 100644
--- a/src/ips_options/ips_byte_extract.cc
+++ b/src/ips_options/ips_byte_extract.cc
@@ -30,7 +30,7 @@
 #include "detection/detection_defines.h"
 #include "detection/detection_util.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/ips_option.h"
 #include "framework/cursor.h"
 #include "framework/parameter.h"
diff --git a/src/ips_options/ips_byte_jump.cc b/src/ips_options/ips_byte_jump.cc
index b4450c20d..727f63c8c 100644
--- a/src/ips_options/ips_byte_jump.cc
+++ b/src/ips_options/ips_byte_jump.cc
@@ -82,7 +82,7 @@
 #include "utils/util.h"
 #include "utils/snort_bounds.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
 #include "detection/detection_util.h"
diff --git a/src/ips_options/ips_byte_test.cc b/src/ips_options/ips_byte_test.cc
index 673a85079..f8c64301f 100644
--- a/src/ips_options/ips_byte_test.cc
+++ b/src/ips_options/ips_byte_test.cc
@@ -102,7 +102,7 @@ using namespace std;
 #include "parser/parser.h"
 #include "utils/util.h"
 #include "utils/snort_bounds.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
diff --git a/src/ips_options/ips_content.cc b/src/ips_options/ips_content.cc
index 1c51f618c..2b597ea50 100644
--- a/src/ips_options/ips_content.cc
+++ b/src/ips_options/ips_content.cc
@@ -38,7 +38,7 @@
 #include "parser/parser.h"
 #include "parser/parse_utils.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
 #include "detection/detection_util.h"
diff --git a/src/ips_options/ips_cvs.cc b/src/ips_options/ips_cvs.cc
index 314b12baf..a3783b862 100644
--- a/src/ips_options/ips_cvs.cc
+++ b/src/ips_options/ips_cvs.cc
@@ -51,7 +51,7 @@
 #include "parser/parser.h"
 #include "utils/util.h"
 #include "utils/snort_bounds.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
diff --git a/src/ips_options/ips_dsize.cc b/src/ips_options/ips_dsize.cc
index 878b82cd6..9677eea0b 100644
--- a/src/ips_options/ips_dsize.cc
+++ b/src/ips_options/ips_dsize.cc
@@ -31,7 +31,7 @@
 #include "parser/parser.h"
 #include "utils/util.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
diff --git a/src/ips_options/ips_file_data.cc b/src/ips_options/ips_file_data.cc
index eb99ac6ca..9d83ae350 100644
--- a/src/ips_options/ips_file_data.cc
+++ b/src/ips_options/ips_file_data.cc
@@ -29,7 +29,7 @@
 
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 #include "detection/detection_util.h"
 #include "framework/cursor.h"
diff --git a/src/ips_options/ips_flags.cc b/src/ips_options/ips_flags.cc
index 454c2c893..ecd7d55bc 100644
--- a/src/ips_options/ips_flags.cc
+++ b/src/ips_options/ips_flags.cc
@@ -33,7 +33,7 @@
 #include "protocols/tcp.h"
 #include "parser/parser.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
diff --git a/src/ips_options/ips_flow.cc b/src/ips_options/ips_flow.cc
index 75e697502..c134a7b6f 100644
--- a/src/ips_options/ips_flow.cc
+++ b/src/ips_options/ips_flow.cc
@@ -35,7 +35,7 @@
 #include "utils/util.h"
 #include "hash/sfhashfcn.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
 #include "framework/parameter.h"
diff --git a/src/ips_options/ips_flowbits.cc b/src/ips_options/ips_flowbits.cc
index 1fd63b8e4..40255055c 100644
--- a/src/ips_options/ips_flowbits.cc
+++ b/src/ips_options/ips_flowbits.cc
@@ -62,7 +62,7 @@ using namespace std;
 #include "hash/sfghash.h"
 #include "parser/mstring.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
diff --git a/src/ips_options/ips_fragbits.cc b/src/ips_options/ips_fragbits.cc
index e990b6de6..5c574cb1c 100644
--- a/src/ips_options/ips_fragbits.cc
+++ b/src/ips_options/ips_fragbits.cc
@@ -56,7 +56,7 @@
 #include "protocols/packet.h"
 #include "parser/parser.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
diff --git a/src/ips_options/ips_fragoffset.cc b/src/ips_options/ips_fragoffset.cc
index 9056ff27b..5151779fc 100644
--- a/src/ips_options/ips_fragoffset.cc
+++ b/src/ips_options/ips_fragoffset.cc
@@ -29,7 +29,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
diff --git a/src/ips_options/ips_hash.cc b/src/ips_options/ips_hash.cc
index 302403857..6c49953d6 100644
--- a/src/ips_options/ips_hash.cc
+++ b/src/ips_options/ips_hash.cc
@@ -32,7 +32,7 @@
 #include "hash/hashes.h"
 #include "framework/cursor.h"
 #include "framework/ips_option.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 #include "detection/detection_util.h"
 #include "framework/parameter.h"
diff --git a/src/ips_options/ips_http.cc b/src/ips_options/ips_http.cc
index dc368bbae..4bbbd0177 100644
--- a/src/ips_options/ips_http.cc
+++ b/src/ips_options/ips_http.cc
@@ -24,7 +24,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "flow/flow.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
diff --git a/src/ips_options/ips_http_header.cc b/src/ips_options/ips_http_header.cc
index 0e19a0b5d..5b2130ea0 100644
--- a/src/ips_options/ips_http_header.cc
+++ b/src/ips_options/ips_http_header.cc
@@ -27,7 +27,7 @@ using namespace std;
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "parser/parser.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "flow/flow.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
diff --git a/src/ips_options/ips_icmp_id.cc b/src/ips_options/ips_icmp_id.cc
index 395b53578..a0b009d6f 100644
--- a/src/ips_options/ips_icmp_id.cc
+++ b/src/ips_options/ips_icmp_id.cc
@@ -48,7 +48,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
diff --git a/src/ips_options/ips_icmp_seq.cc b/src/ips_options/ips_icmp_seq.cc
index 3caede13e..1f1ca07e0 100644
--- a/src/ips_options/ips_icmp_seq.cc
+++ b/src/ips_options/ips_icmp_seq.cc
@@ -47,7 +47,7 @@
 
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
diff --git a/src/ips_options/ips_icode.cc b/src/ips_options/ips_icode.cc
index 00fb6035d..48948fd8f 100644
--- a/src/ips_options/ips_icode.cc
+++ b/src/ips_options/ips_icode.cc
@@ -29,7 +29,7 @@
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
 #include "framework/parameter.h"
diff --git a/src/ips_options/ips_id.cc b/src/ips_options/ips_id.cc
index f8f795df5..6fb8de880 100644
--- a/src/ips_options/ips_id.cc
+++ b/src/ips_options/ips_id.cc
@@ -26,7 +26,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
diff --git a/src/ips_options/ips_ip_proto.cc b/src/ips_options/ips_ip_proto.cc
index 43d613488..34769a760 100644
--- a/src/ips_options/ips_ip_proto.cc
+++ b/src/ips_options/ips_ip_proto.cc
@@ -31,7 +31,7 @@
 #include "protocols/packet.h"
 #include "parser/parser.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
diff --git a/src/ips_options/ips_ipopts.cc b/src/ips_options/ips_ipopts.cc
index 86301bb29..6d2d2fab3 100644
--- a/src/ips_options/ips_ipopts.cc
+++ b/src/ips_options/ips_ipopts.cc
@@ -34,7 +34,7 @@
 #include "protocols/ipv4_options.h"
 #include "parser/parser.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
diff --git a/src/ips_options/ips_isdataat.cc b/src/ips_options/ips_isdataat.cc
index 1b43ad314..437d75cdc 100644
--- a/src/ips_options/ips_isdataat.cc
+++ b/src/ips_options/ips_isdataat.cc
@@ -50,7 +50,7 @@
 #include "main/snort_types.h"
 #include "utils/snort_bounds.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
diff --git a/src/ips_options/ips_itype.cc b/src/ips_options/ips_itype.cc
index 362a6f85a..4bba006c0 100644
--- a/src/ips_options/ips_itype.cc
+++ b/src/ips_options/ips_itype.cc
@@ -25,7 +25,7 @@
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
 #include "framework/parameter.h"
diff --git a/src/ips_options/ips_luajit.cc b/src/ips_options/ips_luajit.cc
index 96a34ee8d..35fd91ca3 100644
--- a/src/ips_options/ips_luajit.cc
+++ b/src/ips_options/ips_luajit.cc
@@ -33,7 +33,7 @@
 #include "framework/module.h"
 #include "framework/parameter.h"
 #include "log/messages.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 
 static THREAD_LOCAL ProfileStats luaIpsPerfStats;
diff --git a/src/ips_options/ips_pcre.cc b/src/ips_options/ips_pcre.cc
index 461d04759..67da20c6d 100644
--- a/src/ips_options/ips_pcre.cc
+++ b/src/ips_options/ips_pcre.cc
@@ -36,7 +36,7 @@
 #include "utils/util.h"
 #include "utils/snort_bounds.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
 #include "detection/detection_util.h"
diff --git a/src/ips_options/ips_pkt_data.cc b/src/ips_options/ips_pkt_data.cc
index 9fb274f40..97276f789 100644
--- a/src/ips_options/ips_pkt_data.cc
+++ b/src/ips_options/ips_pkt_data.cc
@@ -25,7 +25,7 @@
 #include "main/snort_debug.h"
 #include "utils/snort_bounds.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/cursor.h"
 #include "framework/ips_option.h"
 #include "framework/module.h"
diff --git a/src/ips_options/ips_raw_data.cc b/src/ips_options/ips_raw_data.cc
index b63133d3a..ca806d011 100644
--- a/src/ips_options/ips_raw_data.cc
+++ b/src/ips_options/ips_raw_data.cc
@@ -24,7 +24,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 #include "detection/detection_util.h"
 #include "framework/cursor.h"
diff --git a/src/ips_options/ips_regex.cc b/src/ips_options/ips_regex.cc
index 74fddab41..d9140f759 100644
--- a/src/ips_options/ips_regex.cc
+++ b/src/ips_options/ips_regex.cc
@@ -33,7 +33,7 @@
 #include "main/snort_config.h"
 #include "main/thread.h"
 #include "parser/parser.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #define s_name "regex"
 
diff --git a/src/ips_options/ips_replace.cc b/src/ips_options/ips_replace.cc
index d354519dc..c4ac92dab 100644
--- a/src/ips_options/ips_replace.cc
+++ b/src/ips_options/ips_replace.cc
@@ -42,7 +42,7 @@ using namespace std;
 #include "detection/detection_defines.h"
 #include "actions/act_replace.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 static void replace_parse(const char* args, string& s)
 {
diff --git a/src/ips_options/ips_rpc.cc b/src/ips_options/ips_rpc.cc
index ab5fc6947..9e4a34920 100644
--- a/src/ips_options/ips_rpc.cc
+++ b/src/ips_options/ips_rpc.cc
@@ -32,7 +32,7 @@
 #include "main/snort_debug.h"
 #include "utils/util.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/treenodes.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
diff --git a/src/ips_options/ips_seq.cc b/src/ips_options/ips_seq.cc
index 5e6948dad..6814810ce 100644
--- a/src/ips_options/ips_seq.cc
+++ b/src/ips_options/ips_seq.cc
@@ -23,7 +23,7 @@
 
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
diff --git a/src/ips_options/ips_session.cc b/src/ips_options/ips_session.cc
index bc6f8dac3..c5f2f682d 100644
--- a/src/ips_options/ips_session.cc
+++ b/src/ips_options/ips_session.cc
@@ -58,7 +58,7 @@
 #include "protocols/packet.h"
 #include "main/snort_debug.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "detection/treenodes.h"
diff --git a/src/ips_options/ips_so.cc b/src/ips_options/ips_so.cc
index 7a7f7db82..ebf8eb146 100644
--- a/src/ips_options/ips_so.cc
+++ b/src/ips_options/ips_so.cc
@@ -31,7 +31,7 @@ using namespace std;
 #include "managers/so_manager.h"
 #include "hash/sfhashfcn.h"
 #include "parser/parser.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #define s_name "so"
 
diff --git a/src/ips_options/ips_tos.cc b/src/ips_options/ips_tos.cc
index 48459a116..4f289ad26 100644
--- a/src/ips_options/ips_tos.cc
+++ b/src/ips_options/ips_tos.cc
@@ -23,7 +23,7 @@
 
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
diff --git a/src/ips_options/ips_ttl.cc b/src/ips_options/ips_ttl.cc
index 6a84005ab..6a1fd1f61 100644
--- a/src/ips_options/ips_ttl.cc
+++ b/src/ips_options/ips_ttl.cc
@@ -25,7 +25,7 @@
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
 #include "framework/parameter.h"
diff --git a/src/ips_options/ips_window.cc b/src/ips_options/ips_window.cc
index 51f043500..1dafff676 100644
--- a/src/ips_options/ips_window.cc
+++ b/src/ips_options/ips_window.cc
@@ -24,7 +24,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "hash/sfhashfcn.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
diff --git a/src/loggers/alert_luajit.cc b/src/loggers/alert_luajit.cc
index d3e5417e5..d931b4a04 100644
--- a/src/loggers/alert_luajit.cc
+++ b/src/loggers/alert_luajit.cc
@@ -35,7 +35,7 @@
 #include "framework/logger.h"
 #include "framework/module.h"
 #include "framework/parameter.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "utils/stats.h"
 
 static THREAD_LOCAL ProfileStats luaLogPerfStats;
diff --git a/src/main.cc b/src/main.cc
index 66e693927..efdba1f60 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -61,7 +61,7 @@ using namespace std;
 #include "lua/lua.h"
 #include "helpers/process.h"
 #include "helpers/swapper.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "time/periodic.h"
 
 #ifdef UNIT_TEST
diff --git a/src/main/modules.cc b/src/main/modules.cc
index 2a493d3a4..3472ad517 100644
--- a/src/main/modules.cc
+++ b/src/main/modules.cc
@@ -49,8 +49,8 @@ using namespace std;
 #include "filters/sfrf.h"
 #include "filters/rate_filter.h"
 #include "codecs/codec_module.h"
-#include "time/ppm_module.h"
-#include "time/profiler.h"
+#include "ppm/ppm_module.h"
+#include "profiler/profiler.h"
 #include "target_based/sftarget_data.h"
 #include "detection/fp_config.h"
 #include "detection/signature.h"
diff --git a/src/main/snort.cc b/src/main/snort.cc
index 9b60ca4b7..60e5b0c64 100644
--- a/src/main/snort.cc
+++ b/src/main/snort.cc
@@ -81,8 +81,8 @@ using namespace std;
 #include "filters/rate_filter.h"
 #include "filters/detection_filter.h"
 #include "time/packet_time.h"
-#include "time/ppm.h"
-#include "time/profiler.h"
+#include "ppm/ppm.h"
+#include "profiler/profiler.h"
 #include "time/periodic.h"
 #include "perf_monitor/perf.h"
 #include "ips_options/ips_flowbits.h"
diff --git a/src/main/snort_config.cc b/src/main/snort_config.cc
index 1de0243b4..56d7da1fd 100644
--- a/src/main/snort_config.cc
+++ b/src/main/snort_config.cc
@@ -54,8 +54,8 @@
 #include "ips_options/ips_pcre.h"
 #include "ips_options/ips_regex.h"
 #include "protocols/udp.h"
-#include "time/ppm.h"
-#include "time/profiler.h"
+#include "ppm/ppm.h"
+#include "profiler/profiler.h"
 #include "sfip/sf_ip.h"
 
 THREAD_LOCAL SnortConfig* snort_conf = nullptr;
diff --git a/src/managers/inspector_manager.cc b/src/managers/inspector_manager.cc
index eb8fccf1f..1c3622464 100644
--- a/src/managers/inspector_manager.cc
+++ b/src/managers/inspector_manager.cc
@@ -33,7 +33,7 @@
 #include "log/obfuscation.h"
 #include "log/messages.h"
 #include "packet_io/active.h"
-#include "time/ppm.h"
+#include "ppm/ppm.h"
 #include "target_based/snort_protocols.h"
 #include "binder/bind_module.h"
 
diff --git a/src/managers/module_manager.cc b/src/managers/module_manager.cc
index 44d95f727..b53ec2cc0 100644
--- a/src/managers/module_manager.cc
+++ b/src/managers/module_manager.cc
@@ -39,7 +39,7 @@
 #include "parser/parser.h"
 #include "parser/parse_conf.h"
 #include "parser/vars.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "helpers/markup.h"
 #include "utils/stats.h"
 
diff --git a/src/network_inspectors/arp_spoof/arp_spoof.cc b/src/network_inspectors/arp_spoof/arp_spoof.cc
index da5660541..6116440d7 100644
--- a/src/network_inspectors/arp_spoof/arp_spoof.cc
+++ b/src/network_inspectors/arp_spoof/arp_spoof.cc
@@ -85,7 +85,7 @@
 #include "events/event_queue.h"
 #include "parser/parser.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/inspector.h"
 #include "protocols/packet.h"
 #include "protocols/layer.h"
diff --git a/src/network_inspectors/binder/binder.cc b/src/network_inspectors/binder/binder.cc
index c9b9c3d33..a1568b21c 100644
--- a/src/network_inspectors/binder/binder.cc
+++ b/src/network_inspectors/binder/binder.cc
@@ -32,7 +32,7 @@ using namespace std;
 #include "protocols/layer.h"
 #include "stream/stream_api.h"
 #include "stream/stream_splitter.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "utils/stats.h"
 #include "log/messages.h"
 #include "main/snort_config.h"
diff --git a/src/network_inspectors/normalize/normalize.cc b/src/network_inspectors/normalize/normalize.cc
index 685493a8e..dfb9ab244 100644
--- a/src/network_inspectors/normalize/normalize.cc
+++ b/src/network_inspectors/normalize/normalize.cc
@@ -24,7 +24,7 @@
 #include "packet_io/active.h"
 #include "packet_io/sfdaq.h"
 #include "parser/parser.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "framework/inspector.h"
diff --git a/src/network_inspectors/perf_monitor/perf_monitor.cc b/src/network_inspectors/perf_monitor/perf_monitor.cc
index ef898ebc4..b1fc307c9 100644
--- a/src/network_inspectors/perf_monitor/perf_monitor.cc
+++ b/src/network_inspectors/perf_monitor/perf_monitor.cc
@@ -46,7 +46,7 @@
 #include "main/snort_debug.h"
 #include "parser/parser.h"
 #include "packet_io/sfdaq.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/inspector.h"
 #include "utils/stats.h"
 #include "utils/util.h"
diff --git a/src/network_inspectors/port_scan/port_scan.cc b/src/network_inspectors/port_scan/port_scan.cc
index 43ec3b1a7..af1c31608 100644
--- a/src/network_inspectors/port_scan/port_scan.cc
+++ b/src/network_inspectors/port_scan/port_scan.cc
@@ -64,7 +64,7 @@
 #include "utils/util.h"
 #include "utils/sfsnprintfappend.h"
 #include "framework/inspector.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "time/packet_time.h"
 #include "detection/detect.h"
 
diff --git a/src/parser/parse_rule.cc b/src/parser/parse_rule.cc
index a35dd4d58..f1ac3a47f 100644
--- a/src/parser/parse_rule.cc
+++ b/src/parser/parse_rule.cc
@@ -66,7 +66,7 @@
 #include "utils/sflsq.h"
 #include "utils/util.h"
 #include "utils/snort_bounds.h"
-#include "time/ppm.h"
+#include "ppm/ppm.h"
 #include "filters/rate_filter.h"
 #include "filters/detection_filter.h"
 #include "packet_io/active.h"
diff --git a/src/parser/parser.cc b/src/parser/parser.cc
index 53a765846..3af982b3e 100644
--- a/src/parser/parser.cc
+++ b/src/parser/parser.cc
@@ -74,7 +74,7 @@
 #include "sfip/sf_vartable.h"
 #include "sfip/sf_ip.h"
 #include "sfip/sf_ipvar.h"
-#include "time/ppm.h"
+#include "ppm/ppm.h"
 #include "packet_io/active.h"
 #include "file_api/libs/file_config.h"
 #include "actions/actions.h"
diff --git a/src/parser/vars.cc b/src/parser/vars.cc
index 28a2c373e..477673317 100644
--- a/src/parser/vars.cc
+++ b/src/parser/vars.cc
@@ -63,7 +63,7 @@
 #include "sfip/sf_vartable.h"
 #include "sfip/sf_ip.h"
 #include "sfip/sf_ipvar.h"
-#include "time/ppm.h"
+#include "ppm/ppm.h"
 #include "packet_io/active.h"
 #include "file_api/libs/file_config.h"
 #include "framework/ips_option.h"
diff --git a/src/ppm/CMakeLists.txt b/src/ppm/CMakeLists.txt
new file mode 100644
index 000000000..19b6e02a0
--- /dev/null
+++ b/src/ppm/CMakeLists.txt
@@ -0,0 +1,11 @@
+set ( PPM_SOURCES ppm.cc ppm_module.cc )
+set ( PPM_INCLUDES ppm.h )
+
+add_library ( ppm STATIC
+    ${PPM_SOURCES}
+    ${PPM_INCLUDES}
+)
+
+install (FILES ${PPM_INCLUDES}
+    DESTINATION "${INCLUDE_INSTALL_PATH}/ppm"
+)
diff --git a/src/ppm/Makefile.am b/src/ppm/Makefile.am
new file mode 100644
index 000000000..53faefb68
--- /dev/null
+++ b/src/ppm/Makefile.am
@@ -0,0 +1,11 @@
+noinst_LIBRARIES = libppm.a
+
+x_includedir = $(pkgincludedir)/ppm
+
+x_include_HEADERS = ppm.h
+
+libppm_a_SOURCES = \
+ppm.cc \
+ppm.h \
+ppm_module.cc \
+ppm_module.h
diff --git a/src/time/ppm.cc b/src/ppm/ppm.cc
similarity index 97%
rename from src/time/ppm.cc
rename to src/ppm/ppm.cc
index e9a315cf1..cf2e8001e 100644
--- a/src/time/ppm.cc
+++ b/src/ppm/ppm.cc
@@ -45,30 +45,13 @@
 #include "config.h"
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <time.h>
-
 #include "ppm_module.h"
-#include "main/snort_types.h"
-#include "detection/rules.h"
-#include "detection/treenodes.h"
-#include "detection/rules.h"
 #include "detection/fp_create.h"
-#include "detection/detect.h"
 #include "parser/parser.h"
 #include "events/event_queue.h"
-#include "events/event_wrapper.h"
-#include "actions/actions.h"
-#include "protocols/packet.h"
 #include "utils/stats.h"
-#include "utils/util.h"
 #include "sfip/sf_ip.h"
-
-#ifdef PPM_MGR
+#include "time/cpuclock.h"
 
 #define PPM_BASE_SUSPEND_RULE_GID 1000
 #define PPM_BASE_CLEAR_RULE_GID   2000
@@ -526,6 +509,3 @@ void ppm_set_rule_threshold(ppm_cfg_t* ppm_cfg, unsigned int cnt)
 {
     ppm_cfg->rule_threshold = cnt;
 }
-
-#endif
-
diff --git a/src/time/ppm.h b/src/ppm/ppm.h
similarity index 98%
rename from src/time/ppm.h
rename to src/ppm/ppm.h
index 16354710e..246150656 100644
--- a/src/time/ppm.h
+++ b/src/ppm/ppm.h
@@ -27,12 +27,7 @@
 #include "config.h"
 #endif
 
-// FIXIT-M: Instead of an empty source file, use CMake/Make to enable/disable
-//          this compilation unit
-#ifdef PPM_MGR
-#include "main/snort_types.h"
 #include "main/thread.h"
-#include "time/cpuclock.h"
 #include "detection/detection_options.h"
 
 typedef uint64_t PPM_TICKS;
@@ -314,7 +309,5 @@ void ppm_set_rule(detection_option_tree_root_t*, PPM_TICKS);
 #define PPM_GET_TIME()
 #define PPM_SET_TIME()
 
-#endif // PPM_MGR
-
 #endif
 
diff --git a/src/time/ppm_module.cc b/src/ppm/ppm_module.cc
similarity index 99%
rename from src/time/ppm_module.cc
rename to src/ppm/ppm_module.cc
index ebc22a51d..d480e2415 100644
--- a/src/time/ppm_module.cc
+++ b/src/ppm/ppm_module.cc
@@ -31,8 +31,6 @@
 // ppm attributes
 //-------------------------------------------------------------------------
 
-#ifdef PPM_MGR
-
 #define s_name "ppm"
 #define s_help \
     "packet and rule latency monitoring and control (requires --enable-ppm)"
@@ -140,6 +138,3 @@ bool PpmModule::set(const char*, Value& v, SnortConfig* sc)
 
     return true;
 }
-
-#endif
-
diff --git a/src/time/ppm_module.h b/src/ppm/ppm_module.h
similarity index 92%
rename from src/time/ppm_module.h
rename to src/ppm/ppm_module.h
index a2f759073..cbcf9f7fb 100644
--- a/src/time/ppm_module.h
+++ b/src/ppm/ppm_module.h
@@ -26,9 +26,6 @@
 #include "config.h"
 #endif
 
-// FIXIT-M: Instead of an empty source file, use CMake/Make to enable/disable
-//          this compilation unit
-#ifdef PPM_MGR
 #include "framework/module.h"
 
 #define GID_PPM 134
@@ -52,6 +49,5 @@ public:
     { return GID_PPM; }
 };
 
-#endif // PPM_MGR
 #endif
 
diff --git a/src/profiler/CMakeLists.txt b/src/profiler/CMakeLists.txt
new file mode 100644
index 000000000..b53ced4eb
--- /dev/null
+++ b/src/profiler/CMakeLists.txt
@@ -0,0 +1,15 @@
+set ( PROFILER_SOURCES profiler.cc )
+set ( PROFILER_INCLUDES profiler.h )
+
+if ( ENABLE_PERFPROFILING )
+
+    add_library ( profiler STATIC
+        ${PROFILER_SOURCES}
+        ${PROFILER_INCLUDES}
+    )
+
+endif ( ENABLE_PERFPROFILING )
+
+install (FILES ${PROFILER_INCLUDES}
+    DESTINATION "${INCLUDE_INSTALL_PATH}/profiler"
+)
diff --git a/src/profiler/Makefile.am b/src/profiler/Makefile.am
new file mode 100644
index 000000000..d41d2f60e
--- /dev/null
+++ b/src/profiler/Makefile.am
@@ -0,0 +1,13 @@
+if PERF_PROFILING
+noinst_LIBRARIES = libprofiler.a
+endif
+
+x_includedir = $(pkgincludedir)/profiler
+
+x_include_HEADERS = profiler.h
+
+if PERF_PROFILING
+libprofiler_a_SOURCES = \
+profiler.cc \
+profiler.h
+endif
diff --git a/src/time/profiler.cc b/src/profiler/profiler.cc
similarity index 100%
rename from src/time/profiler.cc
rename to src/profiler/profiler.cc
diff --git a/src/time/profiler.h b/src/profiler/profiler.h
similarity index 100%
rename from src/time/profiler.h
rename to src/profiler/profiler.h
diff --git a/src/protocols/packet_manager.cc b/src/protocols/packet_manager.cc
index 844190009..cfb3c7c02 100644
--- a/src/protocols/packet_manager.cc
+++ b/src/protocols/packet_manager.cc
@@ -38,7 +38,7 @@
 #include "protocols/eth.h"
 #include "protocols/icmp4.h"
 #include "protocols/icmp6.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "parser/parser.h"
 
 #include "codecs/codec_module.h"
diff --git a/src/search_engines/ac_banded.cc b/src/search_engines/ac_banded.cc
index e9ebf1489..17e57e4bb 100644
--- a/src/search_engines/ac_banded.cc
+++ b/src/search_engines/ac_banded.cc
@@ -24,7 +24,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------
diff --git a/src/search_engines/ac_bnfa.cc b/src/search_engines/ac_bnfa.cc
index 91be11bd7..88a853ddf 100644
--- a/src/search_engines/ac_bnfa.cc
+++ b/src/search_engines/ac_bnfa.cc
@@ -32,7 +32,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------
diff --git a/src/search_engines/ac_bnfa_q.cc b/src/search_engines/ac_bnfa_q.cc
index 1d26237af..964622e7d 100644
--- a/src/search_engines/ac_bnfa_q.cc
+++ b/src/search_engines/ac_bnfa_q.cc
@@ -32,7 +32,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------
diff --git a/src/search_engines/ac_full.cc b/src/search_engines/ac_full.cc
index f8a652165..78394fb94 100644
--- a/src/search_engines/ac_full.cc
+++ b/src/search_engines/ac_full.cc
@@ -24,7 +24,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------
diff --git a/src/search_engines/ac_full_q.cc b/src/search_engines/ac_full_q.cc
index c29cf45b2..6a34a0962 100644
--- a/src/search_engines/ac_full_q.cc
+++ b/src/search_engines/ac_full_q.cc
@@ -24,7 +24,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------
diff --git a/src/search_engines/ac_sparse.cc b/src/search_engines/ac_sparse.cc
index 37b74fbe9..8e247434f 100644
--- a/src/search_engines/ac_sparse.cc
+++ b/src/search_engines/ac_sparse.cc
@@ -24,7 +24,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------
diff --git a/src/search_engines/ac_sparse_bands.cc b/src/search_engines/ac_sparse_bands.cc
index f797940bb..6317a73eb 100644
--- a/src/search_engines/ac_sparse_bands.cc
+++ b/src/search_engines/ac_sparse_bands.cc
@@ -24,7 +24,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------
diff --git a/src/search_engines/ac_std.cc b/src/search_engines/ac_std.cc
index b7085c23b..4cf66762f 100644
--- a/src/search_engines/ac_std.cc
+++ b/src/search_engines/ac_std.cc
@@ -28,7 +28,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------
diff --git a/src/search_engines/intel_cpm.cc b/src/search_engines/intel_cpm.cc
index d8ff050ad..fb342bc5e 100644
--- a/src/search_engines/intel_cpm.cc
+++ b/src/search_engines/intel_cpm.cc
@@ -28,7 +28,7 @@
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/mpse.h"
 
 //-------------------------------------------------------------------------
diff --git a/src/service_inspectors/back_orifice/back_orifice.cc b/src/service_inspectors/back_orifice/back_orifice.cc
index 17e35ee02..c4553afaf 100644
--- a/src/service_inspectors/back_orifice/back_orifice.cc
+++ b/src/service_inspectors/back_orifice/back_orifice.cc
@@ -123,7 +123,7 @@
 #include "events/event_queue.h"
 #include "parser/parser.h"
 #include "utils/util.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "framework/inspector.h"
 #include "framework/module.h"
 #include "protocols/udp.h"
diff --git a/src/service_inspectors/dns/dns.cc b/src/service_inspectors/dns/dns.cc
index 9f4fffdf1..ba9a2fc68 100644
--- a/src/service_inspectors/dns/dns.cc
+++ b/src/service_inspectors/dns/dns.cc
@@ -35,7 +35,7 @@
 #include "events/event_queue.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/stream_api.h"
 #include "parser/parser.h"
 #include "framework/inspector.h"
diff --git a/src/service_inspectors/dns/dns.h b/src/service_inspectors/dns/dns.h
index a8c0df9f6..f002cf84e 100644
--- a/src/service_inspectors/dns/dns.h
+++ b/src/service_inspectors/dns/dns.h
@@ -24,7 +24,6 @@
 
 #include "protocols/packet.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
 
 // Implementation header with definitions, datatypes and flowdata class for
 // DNS service inspector.
diff --git a/src/service_inspectors/ftp_telnet/ft_main.cc b/src/service_inspectors/ftp_telnet/ft_main.cc
index c0d3d15e8..bf3a5136b 100644
--- a/src/service_inspectors/ftp_telnet/ft_main.cc
+++ b/src/service_inspectors/ftp_telnet/ft_main.cc
@@ -61,7 +61,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_util.h"
 #include "parser/parser.h"
 #include "utils/sfsnprintfappend.h"
diff --git a/src/service_inspectors/ftp_telnet/ft_main.h b/src/service_inspectors/ftp_telnet/ft_main.h
index 3ac9e8c2d..0f82c9b18 100644
--- a/src/service_inspectors/ftp_telnet/ft_main.h
+++ b/src/service_inspectors/ftp_telnet/ft_main.h
@@ -39,7 +39,6 @@
 #include "ftpp_ui_config.h"
 #include "protocols/packet.h"
 #include "framework/bits.h"
-#include "time/profiler.h"
 
 #define BUF_SIZE 1024
 
@@ -59,6 +58,7 @@ FTP_CLIENT_PROTO_CONF* get_ftp_client(Packet*);
 FTP_SERVER_PROTO_CONF* get_ftp_server(Packet*);
 
 #ifdef PERF_PROFILING
+struct ProfileStats;
 void ft_update_perf(ProfileStats&);
 #endif
 
diff --git a/src/service_inspectors/ftp_telnet/ftp.cc b/src/service_inspectors/ftp_telnet/ftp.cc
index 8454f1537..b3896fde7 100644
--- a/src/service_inspectors/ftp_telnet/ftp.cc
+++ b/src/service_inspectors/ftp_telnet/ftp.cc
@@ -48,7 +48,7 @@
 #include "managers/inspector_manager.h"
 #include "detection/detection_util.h"
 #include "target_based/snort_protocols.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 int16_t ftp_data_app_id = SFTARGET_UNKNOWN_PROTOCOL;
 
diff --git a/src/service_inspectors/ftp_telnet/ftp_data.cc b/src/service_inspectors/ftp_telnet/ftp_data.cc
index 5b18658ed..7bb0e8976 100644
--- a/src/service_inspectors/ftp_telnet/ftp_data.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_data.cc
@@ -49,7 +49,7 @@
 #include "framework/inspector.h"
 #include "detection/detection_util.h"
 #include "protocols/tcp.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #define s_name "ftp_data"
 
diff --git a/src/service_inspectors/ftp_telnet/ftp_parse.cc b/src/service_inspectors/ftp_telnet/ftp_parse.cc
index 2bad132b6..20d6654cf 100644
--- a/src/service_inspectors/ftp_telnet/ftp_parse.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_parse.cc
@@ -46,7 +46,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_util.h"
 #include "parser/parser.h"
 #include "parser/mstring.h"
diff --git a/src/service_inspectors/ftp_telnet/ftp_print.cc b/src/service_inspectors/ftp_telnet/ftp_print.cc
index baa69b71d..d4e9bed16 100644
--- a/src/service_inspectors/ftp_telnet/ftp_print.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_print.cc
@@ -48,7 +48,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_util.h"
 #include "parser/parser.h"
 #include "utils/sfsnprintfappend.h"
diff --git a/src/service_inspectors/ftp_telnet/telnet.cc b/src/service_inspectors/ftp_telnet/telnet.cc
index dda3f7fa1..a4dc5e00c 100644
--- a/src/service_inspectors/ftp_telnet/telnet.cc
+++ b/src/service_inspectors/ftp_telnet/telnet.cc
@@ -38,7 +38,7 @@
 
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/stream_api.h"
 #include "file_api/file_api.h"
 #include "parser/parser.h"
diff --git a/src/service_inspectors/gtp/gtp.cc b/src/service_inspectors/gtp/gtp.cc
index 06688b2e3..231ea0b02 100644
--- a/src/service_inspectors/gtp/gtp.cc
+++ b/src/service_inspectors/gtp/gtp.cc
@@ -41,7 +41,7 @@
 #include "main/snort_debug.h"
 #include "main/snort_types.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "gtp.h"
 #include "gtp_inspect.h"
diff --git a/src/service_inspectors/gtp/gtp_inspect.cc b/src/service_inspectors/gtp/gtp_inspect.cc
index 8bc74f45e..3c8f604a1 100644
--- a/src/service_inspectors/gtp/gtp_inspect.cc
+++ b/src/service_inspectors/gtp/gtp_inspect.cc
@@ -27,7 +27,7 @@
 
 #include "managers/inspector_manager.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "gtp.h"
 #include "gtp_module.h"
diff --git a/src/service_inspectors/gtp/gtp_module.cc b/src/service_inspectors/gtp/gtp_module.cc
index 024b9a742..77b6f6474 100644
--- a/src/service_inspectors/gtp/gtp_module.cc
+++ b/src/service_inspectors/gtp/gtp_module.cc
@@ -23,7 +23,7 @@
 #include <cassert>
 
 #include "gtp.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 THREAD_LOCAL ProfileStats gtp_inspect_prof;
 
diff --git a/src/service_inspectors/gtp/ips_gtp_info.cc b/src/service_inspectors/gtp/ips_gtp_info.cc
index 5119d6c5a..07ec4c598 100644
--- a/src/service_inspectors/gtp/ips_gtp_info.cc
+++ b/src/service_inspectors/gtp/ips_gtp_info.cc
@@ -32,7 +32,7 @@
 #include "framework/module.h"
 #include "hash/sfhashfcn.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "gtp.h"
 #include "gtp_inspect.h"
diff --git a/src/service_inspectors/gtp/ips_gtp_type.cc b/src/service_inspectors/gtp/ips_gtp_type.cc
index a02160830..29ee80470 100644
--- a/src/service_inspectors/gtp/ips_gtp_type.cc
+++ b/src/service_inspectors/gtp/ips_gtp_type.cc
@@ -32,7 +32,7 @@
 #include "framework/module.h"
 #include "hash/sfhashfcn.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "gtp.h"
 #include "gtp_inspect.h"
diff --git a/src/service_inspectors/gtp/ips_gtp_version.cc b/src/service_inspectors/gtp/ips_gtp_version.cc
index ea1547f9e..d81a12647 100644
--- a/src/service_inspectors/gtp/ips_gtp_version.cc
+++ b/src/service_inspectors/gtp/ips_gtp_version.cc
@@ -31,7 +31,7 @@
 #include "framework/module.h"
 #include "hash/sfhashfcn.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "gtp_inspect.h"
 
diff --git a/src/service_inspectors/http_inspect/hi_main.cc b/src/service_inspectors/http_inspect/hi_main.cc
index 0a6f04981..cb9e3ae78 100644
--- a/src/service_inspectors/http_inspect/hi_main.cc
+++ b/src/service_inspectors/http_inspect/hi_main.cc
@@ -67,7 +67,7 @@
 #include "utils/sfsnprintfappend.h"
 #include <mime/decode_base.h>
 #include "stream/stream_api.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "loggers/unified2_common.h"
 #include "file_api/file_api.h"
 #include "file_api/file_flows.h"
diff --git a/src/service_inspectors/http_inspect/hi_main.h b/src/service_inspectors/http_inspect/hi_main.h
index f76684c86..3e6ee4345 100644
--- a/src/service_inspectors/http_inspect/hi_main.h
+++ b/src/service_inspectors/http_inspect/hi_main.h
@@ -31,7 +31,6 @@
 #include "stream/stream_api.h"
 #include "detection/detection_util.h"
 #include "search_engines/search_tool.h"
-#include "time/profiler.h"
 #include "utils/util_jsnorm.h"
 #include "utils/util_utf.h"
 
@@ -78,6 +77,7 @@ extern SO_PUBLIC THREAD_LOCAL HttpBuffer http_buffer[HTTP_BUFFER_MAX];
 extern THREAD_LOCAL DataBuffer HttpDecodeBuf;
 
 #ifdef PERF_PROFILING
+struct ProfileStats;
 extern THREAD_LOCAL ProfileStats hiDetectPerfStats;
 extern THREAD_LOCAL int hiDetectCalled;
 #endif
diff --git a/src/service_inspectors/http_inspect/http_inspect.cc b/src/service_inspectors/http_inspect/http_inspect.cc
index 88c655acd..a97fa8bae 100644
--- a/src/service_inspectors/http_inspect/http_inspect.cc
+++ b/src/service_inspectors/http_inspect/http_inspect.cc
@@ -44,7 +44,7 @@
 #include "main/snort_debug.h"
 #include "parser/parser.h"
 #include "decompress/file_decomp.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "detection/detection_util.h"
 #include "stream/stream_api.h"
 #include "target_based/snort_protocols.h"
diff --git a/src/service_inspectors/imap/imap.cc b/src/service_inspectors/imap/imap.cc
index c96509347..3e7a50177 100644
--- a/src/service_inspectors/imap/imap.cc
+++ b/src/service_inspectors/imap/imap.cc
@@ -32,7 +32,7 @@
 #include "events/event_queue.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/stream_api.h"
 #include "file_api/file_api.h"
 #include "parser/parser.h"
diff --git a/src/service_inspectors/imap/imap.h b/src/service_inspectors/imap/imap.h
index c172662f8..3cdb885ba 100644
--- a/src/service_inspectors/imap/imap.h
+++ b/src/service_inspectors/imap/imap.h
@@ -26,7 +26,6 @@
 
 #include "protocols/packet.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
 #include "imap_config.h"
 
 // Direction packet is coming from, if we can figure it out
diff --git a/src/service_inspectors/modbus/ips_modbus_data.cc b/src/service_inspectors/modbus/ips_modbus_data.cc
index ef9aacfc5..4cebf9731 100644
--- a/src/service_inspectors/modbus/ips_modbus_data.cc
+++ b/src/service_inspectors/modbus/ips_modbus_data.cc
@@ -27,7 +27,7 @@
 #include "framework/module.h"
 #include "hash/sfhashfcn.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "modbus.h"
 #include "modbus_decode.h"
diff --git a/src/service_inspectors/modbus/ips_modbus_func.cc b/src/service_inspectors/modbus/ips_modbus_func.cc
index a2e278e8b..b7a36d06e 100644
--- a/src/service_inspectors/modbus/ips_modbus_func.cc
+++ b/src/service_inspectors/modbus/ips_modbus_func.cc
@@ -26,7 +26,7 @@
 #include "framework/module.h"
 #include "hash/sfhashfcn.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "modbus.h"
 
diff --git a/src/service_inspectors/modbus/ips_modbus_unit.cc b/src/service_inspectors/modbus/ips_modbus_unit.cc
index f04642be2..1e5f889c5 100644
--- a/src/service_inspectors/modbus/ips_modbus_unit.cc
+++ b/src/service_inspectors/modbus/ips_modbus_unit.cc
@@ -26,7 +26,7 @@
 #include "framework/module.h"
 #include "hash/sfhashfcn.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "modbus.h"
 
diff --git a/src/service_inspectors/modbus/modbus.cc b/src/service_inspectors/modbus/modbus.cc
index 97a87a2d0..60416ea22 100644
--- a/src/service_inspectors/modbus/modbus.cc
+++ b/src/service_inspectors/modbus/modbus.cc
@@ -26,7 +26,7 @@
 
 #include "events/event_queue.h"
 #include "managers/inspector_manager.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "modbus_decode.h"
 #include "modbus_module.h"
diff --git a/src/service_inspectors/modbus/modbus_module.cc b/src/service_inspectors/modbus/modbus_module.cc
index e9371daa1..8fd46ffdf 100644
--- a/src/service_inspectors/modbus/modbus_module.cc
+++ b/src/service_inspectors/modbus/modbus_module.cc
@@ -21,7 +21,7 @@
 #include "modbus_module.h"
 
 #include "modbus.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 THREAD_LOCAL ProfileStats modbus_prof;
 
diff --git a/src/service_inspectors/pop/pop.cc b/src/service_inspectors/pop/pop.cc
index 9aa82f1b1..68ea49a0c 100644
--- a/src/service_inspectors/pop/pop.cc
+++ b/src/service_inspectors/pop/pop.cc
@@ -30,7 +30,7 @@
 #include "events/event_queue.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/stream_api.h"
 #include "parser/parser.h"
 #include "framework/inspector.h"
diff --git a/src/service_inspectors/pop/pop.h b/src/service_inspectors/pop/pop.h
index f9a4e8124..257c4d1be 100644
--- a/src/service_inspectors/pop/pop.h
+++ b/src/service_inspectors/pop/pop.h
@@ -26,7 +26,6 @@
 
 #include "protocols/packet.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
 #include "pop_config.h"
 
 // Direction packet is coming from, if we can figure it out
diff --git a/src/service_inspectors/rpc_decode/rpc_decode.cc b/src/service_inspectors/rpc_decode/rpc_decode.cc
index c9aa53dbc..e4fc332da 100644
--- a/src/service_inspectors/rpc_decode/rpc_decode.cc
+++ b/src/service_inspectors/rpc_decode/rpc_decode.cc
@@ -49,7 +49,7 @@
 #include "main/snort_debug.h"
 #include "detection/detect.h"
 #include "log/log.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "utils/snort_bounds.h"
 #include "utils/util.h"
 #include "detection/detection_util.h"
diff --git a/src/service_inspectors/sip/ips_sip.cc b/src/service_inspectors/sip/ips_sip.cc
index efb8d13b3..85ab019db 100644
--- a/src/service_inspectors/sip/ips_sip.cc
+++ b/src/service_inspectors/sip/ips_sip.cc
@@ -28,7 +28,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "flow/flow.h"
 #include "detection/detection_defines.h"
 #include "framework/ips_option.h"
diff --git a/src/service_inspectors/sip/ips_sip_method.cc b/src/service_inspectors/sip/ips_sip_method.cc
index bb86b7095..564485716 100644
--- a/src/service_inspectors/sip/ips_sip_method.cc
+++ b/src/service_inspectors/sip/ips_sip_method.cc
@@ -34,7 +34,7 @@
 #include "detection/detect.h"
 #include "detection/detection_defines.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 //-------------------------------------------------------------------------
 // sip_method
diff --git a/src/service_inspectors/sip/ips_sip_stat_code.cc b/src/service_inspectors/sip/ips_sip_stat_code.cc
index 71b6ac695..04ad8428d 100644
--- a/src/service_inspectors/sip/ips_sip_stat_code.cc
+++ b/src/service_inspectors/sip/ips_sip_stat_code.cc
@@ -34,7 +34,7 @@
 #include "detection/detect.h"
 #include "detection/detection_defines.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 //-------------------------------------------------------------------------
 // sip_stat_code
diff --git a/src/service_inspectors/sip/sip.cc b/src/service_inspectors/sip/sip.cc
index f6d1babc8..1441a0674 100644
--- a/src/service_inspectors/sip/sip.cc
+++ b/src/service_inspectors/sip/sip.cc
@@ -31,7 +31,7 @@
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/stream_api.h"
 #include "file_api/file_api.h"
 #include "parser/parser.h"
diff --git a/src/service_inspectors/sip/sip.h b/src/service_inspectors/sip/sip.h
index d3927a9d4..20ccfa91a 100644
--- a/src/service_inspectors/sip/sip.h
+++ b/src/service_inspectors/sip/sip.h
@@ -23,7 +23,6 @@
 
 #include "protocols/packet.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
 #include "sip_config.h"
 #include "sip_dialog.h"
 #include "sip_parser.h"
diff --git a/src/service_inspectors/smtp/smtp.cc b/src/service_inspectors/smtp/smtp.cc
index decd14495..7924d1e33 100644
--- a/src/service_inspectors/smtp/smtp.cc
+++ b/src/service_inspectors/smtp/smtp.cc
@@ -29,7 +29,7 @@
 
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/stream_api.h"
 #include "file_api/file_api.h"
 #include "mime/file_mime_process.h"
diff --git a/src/service_inspectors/smtp/smtp.h b/src/service_inspectors/smtp/smtp.h
index 7d8f660a6..13cb8f02d 100644
--- a/src/service_inspectors/smtp/smtp.h
+++ b/src/service_inspectors/smtp/smtp.h
@@ -27,7 +27,6 @@
 #include "protocols/packet.h"
 #include "stream/stream_api.h"
 #include "main/thread.h"
-#include "time/profiler.h"
 #include "smtp_config.h"
 
 // Direction packet is coming from, if we can figure it out
diff --git a/src/service_inspectors/ssh/ssh.cc b/src/service_inspectors/ssh/ssh.cc
index 87a6b3a59..1976f23c7 100644
--- a/src/service_inspectors/ssh/ssh.cc
+++ b/src/service_inspectors/ssh/ssh.cc
@@ -34,7 +34,7 @@
 #include "events/event_queue.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/stream_api.h"
 #include "file_api/file_api.h"
 #include "parser/parser.h"
diff --git a/src/service_inspectors/ssh/ssh.h b/src/service_inspectors/ssh/ssh.h
index d5fbc2516..06bb6836e 100644
--- a/src/service_inspectors/ssh/ssh.h
+++ b/src/service_inspectors/ssh/ssh.h
@@ -32,7 +32,6 @@
 
 #include "protocols/packet.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
 #include "ssh_config.h"
 
 // Per-session data block containing current state
diff --git a/src/service_inspectors/ssl/ips_ssl_state.cc b/src/service_inspectors/ssl/ips_ssl_state.cc
index b3c950de6..eb888474c 100644
--- a/src/service_inspectors/ssl/ips_ssl_state.cc
+++ b/src/service_inspectors/ssl/ips_ssl_state.cc
@@ -28,7 +28,7 @@
 #include "detection/detect.h"
 #include "detection/detection_defines.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "ssl_inspector.h"
 
diff --git a/src/service_inspectors/ssl/ips_ssl_version.cc b/src/service_inspectors/ssl/ips_ssl_version.cc
index 156d5247c..f03bbbf34 100644
--- a/src/service_inspectors/ssl/ips_ssl_version.cc
+++ b/src/service_inspectors/ssl/ips_ssl_version.cc
@@ -28,7 +28,7 @@
 #include "detection/detect.h"
 #include "detection/detection_defines.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #include "ssl_inspector.h"
 
diff --git a/src/service_inspectors/ssl/ssl_inspector.cc b/src/service_inspectors/ssl/ssl_inspector.cc
index 5f8e19c76..0439c956c 100644
--- a/src/service_inspectors/ssl/ssl_inspector.cc
+++ b/src/service_inspectors/ssl/ssl_inspector.cc
@@ -36,7 +36,7 @@
 #include "events/event_queue.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/stream_api.h"
 #include "parser/parser.h"
 #include "framework/inspector.h"
diff --git a/src/service_inspectors/ssl/ssl_inspector.h b/src/service_inspectors/ssl/ssl_inspector.h
index ad6c47fec..055dbdc37 100644
--- a/src/service_inspectors/ssl/ssl_inspector.h
+++ b/src/service_inspectors/ssl/ssl_inspector.h
@@ -23,7 +23,6 @@
 
 #include "protocols/packet.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
 #include "ssl_config.h"
 
 #define SSLPP_ENCRYPTED_FLAGS \
diff --git a/src/service_inspectors/wizard/wizard.cc b/src/service_inspectors/wizard/wizard.cc
index 033400b49..212a60755 100644
--- a/src/service_inspectors/wizard/wizard.cc
+++ b/src/service_inspectors/wizard/wizard.cc
@@ -25,7 +25,7 @@ using namespace std;
 #include "managers/inspector_manager.h"
 #include "protocols/packet.h"
 #include "stream/stream_splitter.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "utils/stats.h"
 #include "log/messages.h"
 
diff --git a/src/stream/base/stream_base.cc b/src/stream/base/stream_base.cc
index 344e9a365..8be1402b0 100644
--- a/src/stream/base/stream_base.cc
+++ b/src/stream/base/stream_base.cc
@@ -29,7 +29,7 @@
 #include "managers/inspector_manager.h"
 #include "flow/flow_control.h"
 #include "stream/stream_api.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "stream/tcp/tcp_session.h"
 
 //-------------------------------------------------------------------------
diff --git a/src/stream/file/file_session.cc b/src/stream/file/file_session.cc
index 891b09310..f932ad8c6 100644
--- a/src/stream/file/file_session.cc
+++ b/src/stream/file/file_session.cc
@@ -26,7 +26,7 @@
 #include "file_api/file_api.h"
 #include "file_api/file_flows.h"
 #include "perf_monitor/perf.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "packet_io/sfdaq.h"
 #include "detection/detection_util.h"
 #include "target_based/snort_protocols.h"
diff --git a/src/stream/icmp/icmp_session.cc b/src/stream/icmp/icmp_session.cc
index 0b276e49e..991e63322 100644
--- a/src/stream/icmp/icmp_session.cc
+++ b/src/stream/icmp/icmp_session.cc
@@ -32,7 +32,7 @@
 #include "flow/flow_control.h"
 #include "flow/session.h"
 #include "perf_monitor/perf.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "protocols/packet.h"
 #include "protocols/layer.h"
 #include "protocols/vlan.h"
diff --git a/src/stream/ip/ip_defrag.cc b/src/stream/ip/ip_defrag.cc
index 141a9d2d7..4d1faf173 100644
--- a/src/stream/ip/ip_defrag.cc
+++ b/src/stream/ip/ip_defrag.cc
@@ -89,7 +89,7 @@
 #include "protocols/ipv4_options.h"
 #include "protocols/packet_manager.h"
 #include "main/snort_debug.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "time/timersub.h"
 #include "perf_monitor/perf.h"
 #include "utils/stats.h"
diff --git a/src/stream/ip/ip_session.cc b/src/stream/ip/ip_session.cc
index ca78b2108..a16cd9052 100644
--- a/src/stream/ip/ip_session.cc
+++ b/src/stream/ip/ip_session.cc
@@ -30,7 +30,7 @@
 #include "perf_monitor/perf.h"
 #include "flow/flow_control.h"
 #include "sfip/sf_ip.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 THREAD_LOCAL ProfileStats ip_perf_stats;
 
diff --git a/src/stream/tcp/ips_stream_reassemble.cc b/src/stream/tcp/ips_stream_reassemble.cc
index 003ca410c..15ca79d18 100644
--- a/src/stream/tcp/ips_stream_reassemble.cc
+++ b/src/stream/tcp/ips_stream_reassemble.cc
@@ -31,7 +31,7 @@
 #include "detection/detect.h"
 #include "detection/detection_defines.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 
 #ifdef UNIT_TEST
 #include "catch/catch.hpp"
diff --git a/src/stream/tcp/ips_stream_size.cc b/src/stream/tcp/ips_stream_size.cc
index 77a713691..708210f6b 100644
--- a/src/stream/tcp/ips_stream_size.cc
+++ b/src/stream/tcp/ips_stream_size.cc
@@ -29,7 +29,7 @@
 #include "detection/detect.h"
 #include "detection/detection_defines.h"
 #include "hash/sfhashfcn.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "sfip/sf_ip.h"
 
 //-------------------------------------------------------------------------
diff --git a/src/stream/tcp/tcp_module.cc b/src/stream/tcp/tcp_module.cc
index 84601a05b..19fc33512 100644
--- a/src/stream/tcp/tcp_module.cc
+++ b/src/stream/tcp/tcp_module.cc
@@ -21,11 +21,13 @@
 #include "tcp_module.h"
 
 #include <string>
-using namespace std;
 
+#include "profiler/profiler.h"
 #include "stream_tcp.h"
 #include "stream/stream.h"
 
+using namespace std;
+
 //-------------------------------------------------------------------------
 // stream_tcp module
 //-------------------------------------------------------------------------
diff --git a/src/stream/tcp/tcp_module.h b/src/stream/tcp/tcp_module.h
index 2ca30f951..f7707cf28 100644
--- a/src/stream/tcp/tcp_module.h
+++ b/src/stream/tcp/tcp_module.h
@@ -27,7 +27,6 @@
 #include "main/snort_types.h"
 #include "main/thread.h"
 #include "framework/module.h"
-#include "time/profiler.h"
 #include "stream/stream.h"
 
 #define GID_STREAM_TCP  129
diff --git a/src/stream/tcp/tcp_reassembler.cc b/src/stream/tcp/tcp_reassembler.cc
index 9e908b551..e65437ac7 100644
--- a/src/stream/tcp/tcp_reassembler.cc
+++ b/src/stream/tcp/tcp_reassembler.cc
@@ -26,7 +26,7 @@
 #include "main/snort.h"
 #include "protocols/packet.h"
 #include "stream/stream.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "flow/flow_control.h"
 
 #include "tcp_module.h"
diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index 0502d641d..92b430a1a 100644
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -91,7 +91,7 @@
 #include "flow/flow_control.h"
 #include "flow/session.h"
 #include "flow/memcap.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "file_api/file_api.h"
 #include "sfip/sf_ip.h"
 #include "filters/sfrf.h"
diff --git a/src/stream/udp/udp_session.cc b/src/stream/udp/udp_session.cc
index 18a1ee7d4..cce10d512 100644
--- a/src/stream/udp/udp_session.cc
+++ b/src/stream/udp/udp_session.cc
@@ -39,7 +39,7 @@
 #include "flow/session.h"
 #include "packet_io/active.h"
 #include "perf_monitor/perf.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "sfip/sf_ip.h"
 
 // NOTE:  sender is assumed to be client
diff --git a/src/stream/user/user_session.cc b/src/stream/user/user_session.cc
index c10ba0273..0b984e7a5 100644
--- a/src/stream/user/user_session.cc
+++ b/src/stream/user/user_session.cc
@@ -32,7 +32,7 @@
 #include "perf_monitor/perf.h"
 #include "flow/flow_control.h"
 #include "sfip/sf_ip.h"
-#include "time/profiler.h"
+#include "profiler/profiler.h"
 #include "main/snort.h"
 
 THREAD_LOCAL ProfileStats user_perf_stats;
diff --git a/src/time/CMakeLists.txt b/src/time/CMakeLists.txt
index 45bc1d5b5..ee7b71cfa 100644
--- a/src/time/CMakeLists.txt
+++ b/src/time/CMakeLists.txt
@@ -1,12 +1,3 @@
-if ( ENABLE_PERFPROFILING )
-    set ( PROFILER_SOURCES profiler.cc )
-endif ( ENABLE_PERFPROFILING )
-set ( PROFILER_INCLUDES profiler.h )
-
-# FIXIT-L Should this be conditionally compiled as well?
-set ( PPM_SOURCES ppm.cc ppm_module.cc ppm_module.h )
-set ( PPM_INCLUDES ppm.h )
-
 set ( TIME_INTERNAL_SOURCES
     packet_time.cc
     packet_time.h
@@ -16,14 +7,10 @@ set ( TIME_INTERNAL_SOURCES
     )
 
 set ( TIME_INCLUDES
-    ${PROFILER_INCLUDES}
-    ${PPM_INCLUDES}
     cpuclock.h
     )
 
 add_library ( time STATIC
-    ${PROFILER_SOURCES}
-    ${PPM_SOURCES}
     ${TIME_INTERNAL_SOURCES}
     ${TIME_INCLUDES}
     )
diff --git a/src/time/Makefile.am b/src/time/Makefile.am
index 27c7aedb2..84f17f391 100644
--- a/src/time/Makefile.am
+++ b/src/time/Makefile.am
@@ -1,23 +1,13 @@
-
 noinst_LIBRARIES = libtime.a
 
 x_includedir = $(pkgincludedir)/time
 
 x_include_HEADERS = \
-cpuclock.h \
-profiler.h \
-ppm.h
+cpuclock.h
 
 libtime_a_SOURCES = \
 packet_time.cc \
 packet_time.h \
-ppm.cc \
-ppm_module.cc \
-ppm_module.h \
 periodic.cc \
 periodic.h \
 timersub.h
-
-if PERF_PROFILING
-libtime_a_SOURCES += profiler.cc
-endif
diff --git a/src/utils/stats.cc b/src/utils/stats.cc
index 05e69f6f4..cbc82a31f 100644
--- a/src/utils/stats.cc
+++ b/src/utils/stats.cc
@@ -35,8 +35,8 @@
 #include "protocols/packet_manager.h"
 #include "detection/fp_create.h"
 #include "filters/sfthreshold.h"
-#include "time/ppm.h"
-#include "time/profiler.h"
+#include "ppm/ppm.h"
+#include "profiler/profiler.h"
 #include "time/timersub.h"
 #include "file_api/file_stats.h"
 
diff --git a/src/utils/util.cc b/src/utils/util.cc
index 1d1e9d270..be5488002 100644
--- a/src/utils/util.cc
+++ b/src/utils/util.cc
@@ -65,7 +65,7 @@
 #include "packet_io/sfdaq.h"
 #include "packet_io/active.h"
 #include "ips_options/ips_pcre.h"
-#include "time/ppm.h"
+#include "ppm/ppm.h"
 #include "time/packet_time.h"
 #include "time/timersub.h"
 #include "stream/stream.h"