Merge remote-tracking branch 'origin/topic/jsiwek/reorg-followup'

scripts/base/protocols/http/file-extract.bro

@@ -1,6 +1,10 @@
 ##! Extracts the items from HTTP traffic, one per file.  At this time only 
 ##! the message body from the server can be extracted with this script.
 
+@load ./main
+@load ./file-ident
+@load base/utils/files
+
 module HTTP;
 
 export {

scripts/base/protocols/http/file-hash.bro

@@ -1,5 +1,7 @@
 ##! Calculate hashes for HTTP body transfers.
 
+@load ./file-ident
+
 module HTTP;
 
 export {

scripts/base/protocols/http/file-ident.bro

@@ -1,6 +1,11 @@
 ##! This script is involved in the identification of file types in HTTP
 ##! response bodies.
 
+@load base/frameworks/signatures
+@load base/frameworks/notice
+@load ./main
+@load ./utils
+
 # Add the magic number signatures to the core signature set.
 redef signature_files += "base/protocols/http/file-ident.sig";
 # Ignore the signatures used to match files

scripts/base/protocols/http/main.bro

@@ -1,3 +1,5 @@
+@load base/utils/numbers
+@load base/utils/files
 
 module HTTP;
 

scripts/base/protocols/http/partial-content.bro

@@ -3,6 +3,10 @@
 ##!
 ##! This script doesn't work yet and isn't loaded by default.
 
+@load base/frameworks/notice
+@load ./main
+@load ./utils
+
 module HTTP;
 
 export {

scripts/base/protocols/http/utils.bro

@@ -1,5 +1,7 @@
 ##! Utilities specific for HTTP processing.
 
+@load ./main
+
 module HTTP;
 
 export {