Refactoring on `utils.cc' and adjacents

Completely removed the `utils.cc' by moving residual functions into
sub-classes of `utils/'

src/variables/env.cc

@@ -26,7 +26,6 @@
 #include <map>
 
 #include "modsecurity/transaction.h"
-#include "src/utils.h"
 
 extern char **environ;
 

src/variables/rule.cc

@@ -44,11 +44,12 @@
 #include "src/actions/xmlns.h"
 #include "src/actions/log_data.h"
 #include "src/actions/msg.h"
-#include "src/utils.h"
 #include "utils/msc_string.h"
 
+
 using modsecurity::utils::String;
 
+
 namespace modsecurity {
 namespace Variables {
 

src/variables/variable.cc

@@ -22,12 +22,13 @@
 
 #include "modsecurity/transaction.h"
 #include "variations/exclusion.h"
-#include "src/utils.h"
 #include "utils/msc_string.h"
 
+
 using modsecurity::utils::String;
 using modsecurity::Variables::Variations::Exclusion;
 
+
 namespace modsecurity {
 namespace Variables {
 

src/variables/variations/count.cc

@@ -22,12 +22,13 @@
 #include <utility>
 
 #include "modsecurity/transaction.h"
-#include "src/utils.h"
+
 
 namespace modsecurity {
 namespace Variables {
 namespace Variations {
 
+
 void Count::evaluateInternal(Transaction *transaction,
     std::vector<const collection::Variable *> *l) {
     std::vector<const collection::Variable *> *reslIn;

src/variables/variations/exclusion.cc

@@ -22,7 +22,7 @@
 #include <utility>
 
 #include "modsecurity/transaction.h"
-#include "src/utils.h"
+
 
 namespace modsecurity {
 namespace Variables {