diff --git a/aux/bro-aux b/aux/bro-aux
index 181f084432..4bb294d4d1 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit 181f084432e277f899140647d9b788059b3cccb1
+Subproject commit 4bb294d4d15b14a9e49f875b459fdef8286b5957
diff --git a/cmake b/cmake
index aa15263ae3..4f830a0fbf 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit aa15263ae39667e5e9bd73690b05aa4af9147ca3
+Subproject commit 4f830a0fbf078d6b64a9a2264d2d06d89e8fe619
diff --git a/src/iosource/Component.cc b/src/iosource/Component.cc
index 20232161cd..a9cfa37d34 100644
--- a/src/iosource/Component.cc
+++ b/src/iosource/Component.cc
@@ -151,7 +151,7 @@ void PktDumperComponent::DoDescribe(ODesc* d) const
 		if ( prefs.size() )
 			prefs += ", ";
 
-		prefs += *i;
+		prefs += '"' + *i + '"';
 		}
 
 	d->Add("dumper prefix");
diff --git a/src/iosource/IOSource.h b/src/iosource/IOSource.h
index 9083e8f4f1..0e7087a2dd 100644
--- a/src/iosource/IOSource.h
+++ b/src/iosource/IOSource.h
@@ -3,6 +3,10 @@
 #ifndef IOSOURCE_IOSOURCE_H
 #define IOSOURCE_IOSOURCE_H
 
+extern "C" {
+#include <pcap.h>
+}
+
 #include <string>
 
 #include "Timer.h"
diff --git a/src/iosource/PktSrc.h b/src/iosource/PktSrc.h
index c616a2d5b4..75fd2633d0 100644
--- a/src/iosource/PktSrc.h
+++ b/src/iosource/PktSrc.h
@@ -3,10 +3,6 @@
 #ifndef IOSOURCE_PKTSRC_PKTSRC_H
 #define IOSOURCE_PKTSRC_PKTSRC_H
 
-extern "C" {
-#include <pcap.h>
-}
-
 #include "IOSource.h"
 #include "BPF_Program.h"
 #include "Dict.h"
diff --git a/testing/btest/Baseline/plugins.bifs-and-scripts-install/output b/testing/btest/Baseline/plugins.bifs-and-scripts-install/output
index a4187d0f7c..f03cfddc81 100644
--- a/testing/btest/Baseline/plugins.bifs-and-scripts-install/output
+++ b/testing/btest/Baseline/plugins.bifs-and-scripts-install/output
@@ -1,6 +1,6 @@
 Demo::Foo - <Insert description> (dynamic, version 1.0)
-    [Event] plugin_event
     [Function] hello_plugin_world
+    [Event] plugin_event
 
 plugin: automatically loaded at startup
 calling bif, Hello from the plugin!
diff --git a/testing/btest/Baseline/plugins.bifs-and-scripts/output b/testing/btest/Baseline/plugins.bifs-and-scripts/output
index a082b3d690..47dd6ed430 100644
--- a/testing/btest/Baseline/plugins.bifs-and-scripts/output
+++ b/testing/btest/Baseline/plugins.bifs-and-scripts/output
@@ -1,6 +1,6 @@
 Demo::Foo - <Insert description> (dynamic, version 1.0)
-    [Event] plugin_event
     [Function] hello_plugin_world
+    [Event] plugin_event
 
 ===
 plugin: automatically loaded at startup
diff --git a/testing/btest/plugins/bifs-and-scripts-install.sh b/testing/btest/plugins/bifs-and-scripts-install.sh
index 58d0987f5e..158f5fc01f 100644
--- a/testing/btest/plugins/bifs-and-scripts-install.sh
+++ b/testing/btest/plugins/bifs-and-scripts-install.sh
@@ -1,12 +1,14 @@
 # @TEST-EXEC: ${DIST}/aux/bro-aux/plugin-support/init-plugin Demo Foo
 # @TEST-EXEC: bash %INPUT
-# @TEST-EXEC: ./configure --bro-dist=${DIST}
-# @TEST-EXEC: BRO_PLUGIN_INSTALL=`pwd`/test-install make
+# @TEST-EXEC: ./configure --bro-dist=${DIST} --install-root=`pwd`/test-install
+# @TEST-EXEC: make
 # @TEST-EXEC: make install
 # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd`/test-install bro -NN Demo::Foo >>output
 # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro demo/foo -r $TRACES/empty.trace >>output
 # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
 
+mkdir -p scripts/demo/foo/base/
+
 cat >scripts/__load__.bro <<EOF
 @load ./demo/foo/base/at-startup.bro
 EOF
@@ -22,8 +24,6 @@ event bro_init() &priority=-10
         }
 EOF
 
-mkdir -p scripts/demo/foo/base/
-
 cat >scripts/demo/foo/base/at-startup.bro <<EOF
 event bro_init() &priority=10
         {
@@ -32,17 +32,16 @@ event bro_init() &priority=10
         }
 EOF
 
-cat >src/functions.bif <<EOF
+cat >src/foo.bif <<EOF
 function hello_plugin_world%(%): string
         %{
         return new StringVal("Hello from the plugin!");
         %}
+
+event plugin_event%(foo: count%);
 EOF
 
 cat >activate.bro <<EOF
 @load-plugin Demo::Foo
 EOF
 
-cat >src/events.bif <<EOF
-event plugin_event%(foo: count%);
-EOF
diff --git a/testing/btest/plugins/bifs-and-scripts.sh b/testing/btest/plugins/bifs-and-scripts.sh
index 7b4c45cd4e..fe9d8f92b7 100644
--- a/testing/btest/plugins/bifs-and-scripts.sh
+++ b/testing/btest/plugins/bifs-and-scripts.sh
@@ -23,6 +23,8 @@
 
 # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
 
+mkdir -p scripts/demo/foo/base/
+
 cat >scripts/__load__.bro <<EOF
 @load ./demo/foo/base/at-startup.bro
 EOF
@@ -38,8 +40,6 @@ event bro_init() &priority=-10
         }
 EOF
 
-mkdir -p scripts/demo/foo/base/
-
 cat >scripts/demo/foo/base/at-startup.bro <<EOF
 event bro_init() &priority=10
         {
@@ -48,17 +48,16 @@ event bro_init() &priority=10
         }
 EOF
 
-cat >src/functions.bif <<EOF
+cat >src/foo.bif <<EOF
 function hello_plugin_world%(%): string
         %{
         return new StringVal("Hello from the plugin!");
         %}
+
+event plugin_event%(foo: count%);
 EOF
 
 cat >activate.bro <<EOF
 @load-plugin Demo::Foo
 EOF
 
-cat >src/events.bif <<EOF
-event plugin_event%(foo: count%);
-EOF