Fix assorted memory and static analysis errors

src/collection/backend/in_memory-per_process.cc

@@ -21,6 +21,7 @@
 #include <iostream>
 #include <unordered_map>
 #include <list>
+#include <memory>
 #endif
 
 #include "modsecurity/collection/variable.h"
@@ -155,7 +156,8 @@ void InMemoryPerProcess::resolveRegularExpression(const std::string& var,
 }
 
 
-std::unique_ptr<std::string> InMemoryPerProcess::resolveFirst(const std::string& var) {
+std::unique_ptr<std::string> InMemoryPerProcess::resolveFirst(
+    const std::string& var) {
     auto range = equal_range(var);
 
     for (auto it = range.first; it != range.second; ++it) {

src/collection/backend/in_memory-per_process.h

@@ -21,6 +21,7 @@
 #include <list>
 #include <vector>
 #include <algorithm>
+#include <memory>
 #endif
 
 

src/collection/backend/lmdb.cc

@@ -20,6 +20,7 @@
 #include <unistd.h>
 
 #include <string>
+#include <memory>
 
 #include "modsecurity/collection/variable.h"
 #include "src/utils/regex.h"

src/collection/backend/lmdb.h

@@ -22,6 +22,7 @@
 #include <list>
 #include <vector>
 #include <algorithm>
+#include <memory>
 #endif
 
 #ifdef WITH_LMDB

src/collection/collections.cc

@@ -145,8 +145,8 @@ std::unique_ptr<std::string> Collections::resolveFirst(const std::string& var) {
 }
 
 
-std::unique_ptr<std::string> Collections::resolveFirst(const std::string& collectionName,
-        const std::string& var) {
+std::unique_ptr<std::string> Collections::resolveFirst(
+	const std::string& collectionName, const std::string& var) {
         if (utils::string::tolower(collectionName) == "ip"
             && !m_ip_collection_key.empty()) {
             return m_ip_collection->resolveFirst(