Merge remote-tracking branch 'origin/topic/timw/reduce-func-inclusion'

- Minor tweaks to some odd includes during merge

* origin/topic/timw/reduce-func-inclusion:
  Remove Analyzer.h from bro-bif.h
  Remove IPAddr.h from Reporter.h
  Remove the inclusion of Func.h from NetVar.h, which reduces the inclusion of Func.h overall.

src/util.cc

@@ -20,10 +20,6 @@
 #include <mach/mach_init.h>
 #endif
 
-#include <string>
-#include <array>
-#include <vector>
-#include <algorithm>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -43,6 +39,11 @@
 # include <malloc.h>
 #endif
 
+#include <string>
+#include <array>
+#include <vector>
+#include <algorithm>
+
 #include "Desc.h"
 #include "Dict.h"
 #include "digest.h"