Refactoring on rulesProperties class

Among of other things the merge process was improved to detect if
certain properties were set on the origin rule set.

headers/modsecurity/rule.h

@@ -23,7 +23,7 @@
 #ifndef HEADERS_MODSECURITY_RULE_H_
 #define HEADERS_MODSECURITY_RULE_H_
 
-#include "modsecurity/modsecurity.h"
+#include "modsecurity/transaction.h"
 
 
 #ifdef __cplusplus
@@ -32,6 +32,12 @@ namespace modsecurity {
 namespace Variables {
 class Variable;
 }
+namespace actions {
+class Action;
+}
+namespace operators {
+class Operator;
+}
 
 class Rule {
  public: