From 5864c3922d125cc229fb30678c227be290a64ec4 Mon Sep 17 00:00:00 2001
From: Thomas <purcell@fhi-berlin.mpg.de>
Date: Mon, 19 Apr 2021 17:53:11 +0200
Subject: [PATCH] Correct include formatting

Use "file" when it is considered standard
---
 src/classification/ConvexHull1D.cpp           |  2 +-
 src/classification/ConvexHull1D.hpp           |  6 +-
 src/classification/LPWrapper.cpp              |  3 +-
 src/classification/LPWrapper.hpp              |  4 +-
 src/classification/SVMWrapper.cpp             |  2 +-
 src/classification/SVMWrapper.hpp             |  4 +-
 src/classification/prop_sorted_d_mat.cpp      |  2 +-
 src/classification/prop_sorted_d_mat.hpp      |  2 +-
 src/descriptor_identifier/Model/Model.cpp     |  2 +-
 src/descriptor_identifier/Model/Model.hpp     | 10 +--
 .../Model/ModelClassifier.cpp                 |  2 +-
 .../Model/ModelClassifier.hpp                 | 14 ++--
 .../Model/ModelLogRegressor.cpp               |  2 +-
 .../Model/ModelLogRegressor.hpp               |  2 +-
 .../Model/ModelRegressor.cpp                  |  2 +-
 .../Model/ModelRegressor.hpp                  |  6 +-
 .../SISSO_DI/SISSOClassifier.cpp              |  2 +-
 .../SISSO_DI/SISSOClassifier.hpp              | 12 ++--
 .../SISSO_DI/SISSOLogRegressor.cpp            |  2 +-
 .../SISSO_DI/SISSOLogRegressor.hpp            |  4 +-
 .../SISSO_DI/SISSORegressor.cpp               |  2 +-
 .../SISSO_DI/SISSORegressor.hpp               |  7 +-
 .../SISSO_DI/SISSO_DI.cpp                     |  2 +-
 .../SISSO_DI/SISSO_DI.hpp                     |  5 +-
 .../feature_space/FeatureSpace.cpp            |  3 +-
 .../feature_space/FeatureSpace.hpp            | 20 +++---
 src/feature_creation/node/FeatureNode.cpp     |  2 +-
 src/feature_creation/node/FeatureNode.hpp     | 13 ++--
 src/feature_creation/node/ModelNode.cpp       |  2 +-
 src/feature_creation/node/ModelNode.hpp       |  6 +-
 src/feature_creation/node/Node.cpp            |  2 +-
 src/feature_creation/node/Node.hpp            | 12 ++--
 .../node/operator_nodes/OperatorNode.cpp      |  2 +-
 .../node/operator_nodes/OperatorNode.hpp      | 12 ++--
 .../abs/absolute_value.cpp                    |  2 +-
 .../abs/absolute_value.hpp                    |  2 +-
 .../abs/parameterized_absolute_value.cpp      |  2 +-
 .../abs/parameterized_absolute_value.hpp      |  4 +-
 .../abs_diff/absolute_difference.cpp          |  4 +-
 .../abs_diff/absolute_difference.hpp          |  2 +-
 .../parameterized_absolute_difference.cpp     |  2 +-
 .../parameterized_absolute_difference.hpp     |  4 +-
 .../allowed_operator_nodes/add/add.cpp        |  2 +-
 .../allowed_operator_nodes/add/add.hpp        |  2 +-
 .../add/parameterized_add.cpp                 |  2 +-
 .../add/parameterized_add.hpp                 |  4 +-
 .../allowed_operator_nodes/cb/cube.cpp        |  2 +-
 .../allowed_operator_nodes/cb/cube.hpp        |  2 +-
 .../cb/parameterized_cube.cpp                 |  2 +-
 .../cb/parameterized_cube.hpp                 |  4 +-
 .../allowed_operator_nodes/cbrt/cube_root.cpp |  2 +-
 .../allowed_operator_nodes/cbrt/cube_root.hpp |  2 +-
 .../cbrt/parameterized_cube_root.cpp          |  2 +-
 .../cbrt/parameterized_cube_root.hpp          |  4 +-
 .../allowed_operator_nodes/cos/cos.cpp        |  2 +-
 .../allowed_operator_nodes/cos/cos.hpp        |  2 +-
 .../cos/parameterized_cos.cpp                 |  2 +-
 .../cos/parameterized_cos.hpp                 |  4 +-
 .../allowed_operator_nodes/div/divide.cpp     |  2 +-
 .../allowed_operator_nodes/div/divide.hpp     |  2 +-
 .../div/parameterized_divide.cpp              |  2 +-
 .../div/parameterized_divide.hpp              |  4 +-
 .../exp/exponential.cpp                       |  2 +-
 .../exp/exponential.hpp                       |  2 +-
 .../exp/parameterized_exponential.cpp         |  2 +-
 .../exp/parameterized_exponential.hpp         |  4 +-
 .../allowed_operator_nodes/inv/inverse.cpp    |  2 +-
 .../allowed_operator_nodes/inv/inverse.hpp    |  2 +-
 .../inv/parameterized_inverse.cpp             |  2 +-
 .../inv/parameterized_inverse.hpp             |  4 +-
 .../allowed_operator_nodes/log/log.cpp        |  2 +-
 .../allowed_operator_nodes/log/log.hpp        |  2 +-
 .../log/parameterized_log.cpp                 |  2 +-
 .../log/parameterized_log.hpp                 |  4 +-
 .../allowed_operator_nodes/mult/multiply.cpp  |  2 +-
 .../allowed_operator_nodes/mult/multiply.hpp  |  2 +-
 .../mult/parameterized_multiply.cpp           |  2 +-
 .../mult/parameterized_multiply.hpp           |  4 +-
 .../neg_exp/negative_exponential.cpp          |  2 +-
 .../neg_exp/negative_exponential.hpp          |  2 +-
 .../parameterized_negative_exponential.cpp    |  2 +-
 .../parameterized_negative_exponential.hpp    |  4 +-
 .../sin/parameterized_sin.cpp                 |  2 +-
 .../sin/parameterized_sin.hpp                 |  4 +-
 .../allowed_operator_nodes/sin/sin.cpp        |  2 +-
 .../allowed_operator_nodes/sin/sin.hpp        |  2 +-
 .../six_pow/parameterized_sixth_power.cpp     |  2 +-
 .../six_pow/parameterized_sixth_power.hpp     |  4 +-
 .../six_pow/sixth_power.cpp                   |  2 +-
 .../six_pow/sixth_power.hpp                   |  2 +-
 .../sq/parameterized_square.cpp               |  2 +-
 .../sq/parameterized_square.hpp               |  4 +-
 .../allowed_operator_nodes/sq/square.cpp      |  2 +-
 .../allowed_operator_nodes/sq/square.hpp      |  2 +-
 .../sqrt/parameterized_square_root.cpp        |  2 +-
 .../sqrt/parameterized_square_root.hpp        |  4 +-
 .../sqrt/square_root.cpp                      |  2 +-
 .../sqrt/square_root.hpp                      |  2 +-
 .../sub/parameterized_subtract.cpp            |  2 +-
 .../sub/parameterized_subtract.hpp            |  4 +-
 .../allowed_operator_nodes/sub/subtract.cpp   |  2 +-
 .../allowed_operator_nodes/sub/subtract.hpp   |  3 +-
 .../node/operator_nodes/allowed_ops.cpp       |  2 +-
 .../node/operator_nodes/allowed_ops.hpp       | 68 +++++++++----------
 .../operator_nodes/allowed_parameter_ops.cpp  |  2 +-
 src/feature_creation/node/utils.cpp           |  2 +-
 src/feature_creation/node/utils.hpp           | 10 +--
 .../value_storage/nodes_value_containers.cpp  |  3 +-
 .../value_storage/nodes_value_containers.hpp  |  2 +-
 src/feature_creation/units/Unit.cpp           |  2 +-
 src/feature_creation/units/Unit.hpp           |  2 +-
 src/inputs/InputParser.cpp                    |  2 +-
 src/inputs/InputParser.hpp                    |  4 +-
 src/main.cpp                                  | 13 ++--
 src/mpi_interface/MPI_Interface.cpp           |  2 +-
 src/mpi_interface/MPI_ops.cpp                 |  2 +-
 src/mpi_interface/MPI_ops.hpp                 |  5 +-
 src/nl_opt/NLOptWrapper.cpp                   |  3 +-
 src/nl_opt/NLOptWrapper.hpp                   |  4 +-
 src/python/bindings_docstring_keyed.cpp       |  2 +-
 src/python/bindings_docstring_keyed.hpp       | 14 ++--
 src/python/conversion_utils.hpp               |  6 +-
 src/python/descriptor_identifier/Model.cpp    |  2 +-
 .../descriptor_identifier/ModelClassifier.cpp |  2 +-
 .../descriptor_identifier/SISSOClassifier.cpp |  2 +-
 .../SISSOLogRegressor.cpp                     |  2 +-
 .../descriptor_identifier/SISSORegressor.cpp  |  2 +-
 src/python/descriptor_identifier/SISSO_DI.cpp |  2 +-
 src/python/feature_creation/FeatureNode.cpp   |  2 +-
 src/python/feature_creation/FeatureSpace.cpp  |  2 +-
 src/python/feature_creation/ModelNode.cpp     |  2 +-
 src/python/feature_creation/node_utils.cpp    |  2 +-
 src/python/feature_creation/node_utils.hpp    |  4 +-
 src/utils/compare_features.cpp                |  2 +-
 src/utils/compare_features.hpp                |  2 +-
 src/utils/math_funcs.cpp                      |  2 +-
 src/utils/math_funcs.hpp                      |  4 +-
 src/utils/project.cpp                         |  2 +-
 src/utils/project.hpp                         |  6 +-
 src/utils/string_utils.cpp                    |  2 +-
 140 files changed, 272 insertions(+), 270 deletions(-)

diff --git a/src/classification/ConvexHull1D.cpp b/src/classification/ConvexHull1D.cpp
index 6c01621e..9359f7ac 100644
--- a/src/classification/ConvexHull1D.cpp
+++ b/src/classification/ConvexHull1D.cpp
@@ -1,4 +1,4 @@
-#include <classification/ConvexHull1D.hpp>
+#include "classification/ConvexHull1D.hpp"
 
 ConvexHull1D::ConvexHull1D() :
     _sorted_value(),
diff --git a/src/classification/ConvexHull1D.hpp b/src/classification/ConvexHull1D.hpp
index b4ff3921..6f50c6a9 100644
--- a/src/classification/ConvexHull1D.hpp
+++ b/src/classification/ConvexHull1D.hpp
@@ -8,10 +8,12 @@
 #ifndef CONVEX_UTILS
 #define CONVEX_UTILS
 
-#include <utils/math_funcs.hpp>
 #include <iomanip>
+
 #include <coin/ClpSimplex.hpp>
-#include <classification/prop_sorted_d_mat.hpp>
+
+#include "classification/prop_sorted_d_mat.hpp"
+#include "utils/math_funcs.hpp"
 
 class ConvexHull1D
 {
diff --git a/src/classification/LPWrapper.cpp b/src/classification/LPWrapper.cpp
index dbe7bf57..5fd46e7a 100644
--- a/src/classification/LPWrapper.cpp
+++ b/src/classification/LPWrapper.cpp
@@ -1,4 +1,5 @@
-#include <classification/LPWrapper.hpp>
+#include "classification/LPWrapper.hpp"
+
 LPWrapper::LPWrapper(std::vector<int> samp_per_class, const int task_num, const int n_class, const int n_dim, const int n_samp, const double tol) :
     _elements((n_dim + 1) * n_samp, 0.0),
     _row_lower((n_dim + 1) * n_samp, 1.0),
diff --git a/src/classification/LPWrapper.hpp b/src/classification/LPWrapper.hpp
index f3157242..7c4ee427 100644
--- a/src/classification/LPWrapper.hpp
+++ b/src/classification/LPWrapper.hpp
@@ -14,8 +14,8 @@
 
 #include <coin/ClpSimplex.hpp>
 
-#include <classification/prop_sorted_d_mat.hpp>
-#include <utils/mkl_interface.hpp>
+#include "classification/prop_sorted_d_mat.hpp"
+#include "utils/mkl_interface.hpp"
 class LPWrapper
 {
 protected:
diff --git a/src/classification/SVMWrapper.cpp b/src/classification/SVMWrapper.cpp
index 53048ab1..97a0e1a0 100644
--- a/src/classification/SVMWrapper.cpp
+++ b/src/classification/SVMWrapper.cpp
@@ -1,4 +1,4 @@
-#include <classification/SVMWrapper.hpp>
+#include "classification/SVMWrapper.hpp"
 
 SVMWrapper::SVMWrapper(const int n_class, const int n_dim, const int n_samp, const double* prop) :
     _model(nullptr),
diff --git a/src/classification/SVMWrapper.hpp b/src/classification/SVMWrapper.hpp
index 3fbf758b..e97dc8cc 100644
--- a/src/classification/SVMWrapper.hpp
+++ b/src/classification/SVMWrapper.hpp
@@ -12,8 +12,8 @@
 #include <iostream>
 #include <numeric>
 
-#include <classification/prop_sorted_d_mat.hpp>
-#include <external/libsvm/svm.h>
+#include "classification/prop_sorted_d_mat.hpp"
+#include "external/libsvm/svm.h"
 
 class SVMWrapper
 {
diff --git a/src/classification/prop_sorted_d_mat.cpp b/src/classification/prop_sorted_d_mat.cpp
index 37e5bd0d..500e6733 100644
--- a/src/classification/prop_sorted_d_mat.cpp
+++ b/src/classification/prop_sorted_d_mat.cpp
@@ -1,4 +1,4 @@
-#include <classification/prop_sorted_d_mat.hpp>
+#include "classification/prop_sorted_d_mat.hpp"
 
 std::vector<double> prop_sorted_d_mat::SORTED_D_MATRIX;
 
diff --git a/src/classification/prop_sorted_d_mat.hpp b/src/classification/prop_sorted_d_mat.hpp
index c604329b..3043d41f 100644
--- a/src/classification/prop_sorted_d_mat.hpp
+++ b/src/classification/prop_sorted_d_mat.hpp
@@ -1,4 +1,4 @@
-/** @file <classification/prop_sorted_d_mat.hp
+/** @file classification/prop_sorted_d_mat.hpp
  *  @brief Central storage area for a sorted descriptor matrix based on the task/class of a sample
 
  *  @author Thomas A. R. Purcell (tpurcell)
diff --git a/src/descriptor_identifier/Model/Model.cpp b/src/descriptor_identifier/Model/Model.cpp
index 4b43809b..1e05768c 100644
--- a/src/descriptor_identifier/Model/Model.cpp
+++ b/src/descriptor_identifier/Model/Model.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/Model/Model.hpp>
+#include "descriptor_identifier/Model/Model.hpp"
 
 Model::Model(
     const std::string prop_label,
diff --git a/src/descriptor_identifier/Model/Model.hpp b/src/descriptor_identifier/Model/Model.hpp
index 0022ef8e..ba545681 100644
--- a/src/descriptor_identifier/Model/Model.hpp
+++ b/src/descriptor_identifier/Model/Model.hpp
@@ -14,12 +14,12 @@
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/filesystem.hpp>
 
-#include<iomanip>
-#include<fstream>
-#include<iostream>
+#include <iomanip>
+#include <fstream>
+#include <iostream>
 
-#include <feature_creation/node/ModelNode.hpp>
-#include <utils/string_utils.hpp>
+#include "feature_creation/node/ModelNode.hpp"
+#include "utils/string_utils.hpp"
 
 #ifdef PY_BINDINGS
     namespace np = boost::python::numpy;
diff --git a/src/descriptor_identifier/Model/ModelClassifier.cpp b/src/descriptor_identifier/Model/ModelClassifier.cpp
index f1f33766..5d5df407 100644
--- a/src/descriptor_identifier/Model/ModelClassifier.cpp
+++ b/src/descriptor_identifier/Model/ModelClassifier.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/Model/ModelClassifier.hpp>
+#include "descriptor_identifier/Model/ModelClassifier.hpp"
 
 ModelClassifier::ModelClassifier(
     const std::string prop_label,
diff --git a/src/descriptor_identifier/Model/ModelClassifier.hpp b/src/descriptor_identifier/Model/ModelClassifier.hpp
index 04e4ffd6..1ff38237 100644
--- a/src/descriptor_identifier/Model/ModelClassifier.hpp
+++ b/src/descriptor_identifier/Model/ModelClassifier.hpp
@@ -14,16 +14,16 @@
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/filesystem.hpp>
 
-#include<iomanip>
-#include<fstream>
-#include<iostream>
+#include <iomanip>
+#include <fstream>
+#include <iostream>
 
 #include <coin/ClpSimplex.hpp>
 
-#include <classification/SVMWrapper.hpp>
-#include <descriptor_identifier/Model/Model.hpp>
-#include <feature_creation/node/ModelNode.hpp>
-#include <utils/string_utils.hpp>
+#include "classification/SVMWrapper.hpp"
+#include "descriptor_identifier/Model/Model.hpp"
+#include "feature_creation/node/ModelNode.hpp"
+#include "utils/string_utils.hpp"
 
 #ifdef PY_BINDINGS
     namespace np = boost::python::numpy;
diff --git a/src/descriptor_identifier/Model/ModelLogRegressor.cpp b/src/descriptor_identifier/Model/ModelLogRegressor.cpp
index 652d2975..56e6fbee 100644
--- a/src/descriptor_identifier/Model/ModelLogRegressor.cpp
+++ b/src/descriptor_identifier/Model/ModelLogRegressor.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/Model/ModelLogRegressor.hpp>
+#include "descriptor_identifier/Model/ModelLogRegressor.hpp"
 
 ModelLogRegressor::ModelLogRegressor()
 {}
diff --git a/src/descriptor_identifier/Model/ModelLogRegressor.hpp b/src/descriptor_identifier/Model/ModelLogRegressor.hpp
index ef9b5109..3309bcf1 100644
--- a/src/descriptor_identifier/Model/ModelLogRegressor.hpp
+++ b/src/descriptor_identifier/Model/ModelLogRegressor.hpp
@@ -10,7 +10,7 @@
 #ifndef MODEL_LOG_REGRESSOR
 #define MODEL_LOG_REGRESSOR
 
-#include <descriptor_identifier/Model/ModelRegressor.hpp>
+#include "descriptor_identifier/Model/ModelRegressor.hpp"
 
 #ifdef PY_BINDINGS
     namespace np = boost::python::numpy;
diff --git a/src/descriptor_identifier/Model/ModelRegressor.cpp b/src/descriptor_identifier/Model/ModelRegressor.cpp
index dd38fc25..dcd61a60 100644
--- a/src/descriptor_identifier/Model/ModelRegressor.cpp
+++ b/src/descriptor_identifier/Model/ModelRegressor.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/Model/ModelRegressor.hpp>
+#include "descriptor_identifier/Model/ModelRegressor.hpp"
 
 ModelRegressor::ModelRegressor()
 {}
diff --git a/src/descriptor_identifier/Model/ModelRegressor.hpp b/src/descriptor_identifier/Model/ModelRegressor.hpp
index a70182ea..86fbdac3 100644
--- a/src/descriptor_identifier/Model/ModelRegressor.hpp
+++ b/src/descriptor_identifier/Model/ModelRegressor.hpp
@@ -18,9 +18,9 @@
 #include<fstream>
 #include<iostream>
 
-#include <descriptor_identifier/Model/Model.hpp>
-#include <feature_creation/node/ModelNode.hpp>
-#include <utils/string_utils.hpp>
+#include "descriptor_identifier/Model/Model.hpp"
+#include "feature_creation/node/ModelNode.hpp"
+#include "utils/string_utils.hpp"
 
 #ifdef PY_BINDINGS
     namespace np = boost::python::numpy;
diff --git a/src/descriptor_identifier/SISSO_DI/SISSOClassifier.cpp b/src/descriptor_identifier/SISSO_DI/SISSOClassifier.cpp
index 8931049a..45950f27 100644
--- a/src/descriptor_identifier/SISSO_DI/SISSOClassifier.cpp
+++ b/src/descriptor_identifier/SISSO_DI/SISSOClassifier.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/SISSO_DI/SISSOClassifier.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSOClassifier.hpp"
 
 SISSOClassifier::SISSOClassifier(
     const std::shared_ptr<FeatureSpace> feat_space,
diff --git a/src/descriptor_identifier/SISSO_DI/SISSOClassifier.hpp b/src/descriptor_identifier/SISSO_DI/SISSOClassifier.hpp
index cd8ffc03..11a9d6ff 100644
--- a/src/descriptor_identifier/SISSO_DI/SISSOClassifier.hpp
+++ b/src/descriptor_identifier/SISSO_DI/SISSOClassifier.hpp
@@ -11,12 +11,12 @@
 
 #include <coin/ClpSimplex.hpp>
 
-#include <classification/prop_sorted_d_mat.hpp>
-#include <classification/SVMWrapper.hpp>
-#include <classification/LPWrapper.hpp>
-#include <feature_creation/feature_space/FeatureSpace.hpp>
-#include <descriptor_identifier/Model/ModelClassifier.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSO_DI.hpp>
+#include "classification/prop_sorted_d_mat.hpp"
+#include "classification/SVMWrapper.hpp"
+#include "classification/LPWrapper.hpp"
+#include "feature_creation/feature_space/FeatureSpace.hpp"
+#include "descriptor_identifier/Model/ModelClassifier.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSO_DI.hpp"
 
 #include <ctime>
 #include <iomanip>
diff --git a/src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.cpp b/src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.cpp
index bb5d72e5..c88564d4 100644
--- a/src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.cpp
+++ b/src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp"
 
 SISSOLogRegressor::SISSOLogRegressor(
     const std::shared_ptr<FeatureSpace> feat_space,
diff --git a/src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp b/src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp
index bd54aadd..01f740cc 100644
--- a/src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp
+++ b/src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp
@@ -9,8 +9,8 @@
 #ifndef SISSO_LOG_REGRESSOR
 #define SISSO_LOG_REGRESSOR
 
-#include <descriptor_identifier/Model/ModelLogRegressor.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSORegressor.hpp>
+#include "descriptor_identifier/Model/ModelLogRegressor.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSORegressor.hpp"
 
 #ifdef PY_BINDINGS
     namespace np = boost::python::numpy;
diff --git a/src/descriptor_identifier/SISSO_DI/SISSORegressor.cpp b/src/descriptor_identifier/SISSO_DI/SISSORegressor.cpp
index 02363bfb..d710b5e1 100644
--- a/src/descriptor_identifier/SISSO_DI/SISSORegressor.cpp
+++ b/src/descriptor_identifier/SISSO_DI/SISSORegressor.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/SISSO_DI/SISSORegressor.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSORegressor.hpp"
 
 SISSORegressor::SISSORegressor(
     const std::shared_ptr<FeatureSpace> feat_space,
diff --git a/src/descriptor_identifier/SISSO_DI/SISSORegressor.hpp b/src/descriptor_identifier/SISSO_DI/SISSORegressor.hpp
index 0dffca8e..265fd5d4 100644
--- a/src/descriptor_identifier/SISSO_DI/SISSORegressor.hpp
+++ b/src/descriptor_identifier/SISSO_DI/SISSORegressor.hpp
@@ -9,11 +9,12 @@
 #ifndef SISSO_REGRESSOR
 #define SISSO_REGRESSOR
 
-#include <feature_creation/feature_space/FeatureSpace.hpp>
-#include <descriptor_identifier/Model/ModelRegressor.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSO_DI.hpp>
 #include <ctime>
 
+#include "feature_creation/feature_space/FeatureSpace.hpp"
+#include "descriptor_identifier/Model/ModelRegressor.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSO_DI.hpp"
+
 #ifdef PY_BINDINGS
     namespace np = boost::python::numpy;
     namespace py = boost::python;
diff --git a/src/descriptor_identifier/SISSO_DI/SISSO_DI.cpp b/src/descriptor_identifier/SISSO_DI/SISSO_DI.cpp
index bbfff6f8..7c60edf7 100644
--- a/src/descriptor_identifier/SISSO_DI/SISSO_DI.cpp
+++ b/src/descriptor_identifier/SISSO_DI/SISSO_DI.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/SISSO_DI/SISSO_DI.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSO_DI.hpp"
 
 SISSO_DI::SISSO_DI(
     const std::shared_ptr<FeatureSpace> feat_space,
diff --git a/src/descriptor_identifier/SISSO_DI/SISSO_DI.hpp b/src/descriptor_identifier/SISSO_DI/SISSO_DI.hpp
index 7b123c51..0b232ae9 100644
--- a/src/descriptor_identifier/SISSO_DI/SISSO_DI.hpp
+++ b/src/descriptor_identifier/SISSO_DI/SISSO_DI.hpp
@@ -9,11 +9,12 @@
 #ifndef SISSO_DESCRIPTOR_ID
 #define SISSO_DESCRIPTOR_ID
 
-#include <feature_creation/feature_space/FeatureSpace.hpp>
-#include <descriptor_identifier/Model/Model.hpp>
 #include <ctime>
 #include <limits>
 
+#include "feature_creation/feature_space/FeatureSpace.hpp"
+#include "descriptor_identifier/Model/Model.hpp"
+
 #ifdef PY_BINDINGS
     namespace np = boost::python::numpy;
     namespace py = boost::python;
diff --git a/src/feature_creation/feature_space/FeatureSpace.cpp b/src/feature_creation/feature_space/FeatureSpace.cpp
index 7c7cb9fc..3edd0b3f 100644
--- a/src/feature_creation/feature_space/FeatureSpace.cpp
+++ b/src/feature_creation/feature_space/FeatureSpace.cpp
@@ -1,5 +1,4 @@
-#include <feature_creation/feature_space/FeatureSpace.hpp>
-#include <iomanip>
+#include "feature_creation/feature_space/FeatureSpace.hpp"
 
 BOOST_CLASS_EXPORT_GUID(FeatureNode, "FeatureNode")
 BOOST_CLASS_EXPORT_GUID(AddNode, "AddNode")
diff --git a/src/feature_creation/feature_space/FeatureSpace.hpp b/src/feature_creation/feature_space/FeatureSpace.hpp
index e773d451..5b8279e8 100644
--- a/src/feature_creation/feature_space/FeatureSpace.hpp
+++ b/src/feature_creation/feature_space/FeatureSpace.hpp
@@ -10,16 +10,6 @@
 #ifndef FEATURE_SPACE
 #define FEATURE_SPACE
 
-#include <mpi_interface/MPI_Interface.hpp>
-#include <mpi_interface/MPI_ops.hpp>
-#include <mpi_interface/serialize_tuple.h>
-#include <feature_creation/node/ModelNode.hpp>
-#include <feature_creation/node/operator_nodes/allowed_ops.hpp>
-#include <feature_creation/node/utils.hpp>
-#include <feature_creation/node/value_storage/nodes_value_containers.hpp>
-#include <utils/compare_features.hpp>
-#include <utils/project.hpp>
-
 #include <boost/serialization/shared_ptr.hpp>
 #include <boost/filesystem.hpp>
 
@@ -27,6 +17,16 @@
 #include <iomanip>
 #include <utility>
 
+#include "mpi_interface/MPI_Interface.hpp"
+#include "mpi_interface/MPI_ops.hpp"
+#include "mpi_interface/serialize_tuple.h"
+#include "feature_creation/node/ModelNode.hpp"
+#include "feature_creation/node/operator_nodes/allowed_ops.hpp"
+#include "feature_creation/node/utils.hpp"
+#include "feature_creation/node/value_storage/nodes_value_containers.hpp"
+#include "utils/compare_features.hpp"
+#include "utils/project.hpp"
+
 #ifdef PY_BINDINGS
     namespace np = boost::python::numpy;
     namespace py = boost::python;
diff --git a/src/feature_creation/node/FeatureNode.cpp b/src/feature_creation/node/FeatureNode.cpp
index 8a516bef..a5944607 100644
--- a/src/feature_creation/node/FeatureNode.cpp
+++ b/src/feature_creation/node/FeatureNode.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/FeatureNode.hpp>
+#include "feature_creation/node/FeatureNode.hpp"
 
 FeatureNode::FeatureNode()
 {}
diff --git a/src/feature_creation/node/FeatureNode.hpp b/src/feature_creation/node/FeatureNode.hpp
index 477e36cd..a6a1f9d1 100644
--- a/src/feature_creation/node/FeatureNode.hpp
+++ b/src/feature_creation/node/FeatureNode.hpp
@@ -9,16 +9,15 @@
 #ifndef FEATURE_NODE
 #define FEATURE_NODE
 
-#include <utils/math_funcs.hpp>
-#include <utils/enum.hpp>
-#include <utils/string_utils.hpp>
-
 #include <memory>
 
 #include <boost/serialization/export.hpp>
 #include <boost/serialization/base_object.hpp>
 
-#include <feature_creation/node/Node.hpp>
+#include "feature_creation/node/Node.hpp"
+#include "utils/math_funcs.hpp"
+#include "utils/enum.hpp"
+#include "utils/string_utils.hpp"
 
 #ifdef PY_BINDINGS
 namespace np = boost::python::numpy;
@@ -81,7 +80,7 @@ public:
     );
     #ifdef PY_BINDINGS
     /**
-     * @brief Constructs a feature node using numpy arrays (cpp definition in <python/feature_creation/FeatureNode.cpp)
+     * @brief Constructs a feature node using numpy arrays (cpp definition in "python/feature_creation/FeatureNode.cpp)
      *
      * @param feat_ind index of the feature
      * @param expr Expression for the feature
@@ -92,7 +91,7 @@ public:
     FeatureNode(unsigned long int feat_ind, std::string expr, np::ndarray value, np::ndarray test_value, Unit unit);
 
     /**
-     * @brief Constructs a feature node using Python lists (cpp definition in <python/feature_creation/FeatureNode.cpp)
+     * @brief Constructs a feature node using Python lists (cpp definition in "python/feature_creation/FeatureNode.cpp)
      *
      * @param feat_ind index of the feature
      * @param expr Expression for the feature
diff --git a/src/feature_creation/node/ModelNode.cpp b/src/feature_creation/node/ModelNode.cpp
index d6c20df9..c23d0aa2 100644
--- a/src/feature_creation/node/ModelNode.cpp
+++ b/src/feature_creation/node/ModelNode.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/ModelNode.hpp>
+#include "feature_creation/node/ModelNode.hpp"
 
 ModelNode::ModelNode()
 {}
diff --git a/src/feature_creation/node/ModelNode.hpp b/src/feature_creation/node/ModelNode.hpp
index b70d0c3f..9ee722b8 100644
--- a/src/feature_creation/node/ModelNode.hpp
+++ b/src/feature_creation/node/ModelNode.hpp
@@ -12,9 +12,9 @@
 #include <algorithm>
 #include <numeric>
 
-#include <feature_creation/node/FeatureNode.hpp>
-#include <feature_creation/node/operator_nodes/functions.hpp>
-#include <utils/string_utils.hpp>
+#include "feature_creation/node/FeatureNode.hpp"
+#include "feature_creation/node/operator_nodes/functions.hpp"
+#include "utils/string_utils.hpp"
 
 typedef std::pair<std::function<void(int, std::vector<double*>&)>, int> fxn_nterms_pair;
 // DocString: cls_model_node
diff --git a/src/feature_creation/node/Node.cpp b/src/feature_creation/node/Node.cpp
index 663e3122..58c6735e 100644
--- a/src/feature_creation/node/Node.cpp
+++ b/src/feature_creation/node/Node.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/Node.hpp>
+#include "feature_creation/node/Node.hpp"
 
 Node::Node()
 {}
diff --git a/src/feature_creation/node/Node.hpp b/src/feature_creation/node/Node.hpp
index fb1e7f06..8ec316ab 100644
--- a/src/feature_creation/node/Node.hpp
+++ b/src/feature_creation/node/Node.hpp
@@ -11,11 +11,6 @@
 #ifndef NODE
 #define NODE
 
-#include <feature_creation/node/value_storage/nodes_value_containers.hpp>
-#include <feature_creation/units/Unit.hpp>
-#include <utils/math_funcs.hpp>
-#include <utils/enum.hpp>
-
 #include <cmath>
 #include <memory>
 
@@ -24,8 +19,13 @@
 #include <boost/serialization/string.hpp>
 #include <boost/serialization/unique_ptr.hpp>
 
+#include "feature_creation/node/value_storage/nodes_value_containers.hpp"
+#include "feature_creation/units/Unit.hpp"
+#include "utils/math_funcs.hpp"
+#include "utils/enum.hpp"
+
 #ifdef PY_BINDINGS
-#include <python/conversion_utils.hpp>
+#include "python/conversion_utils.hpp"
 namespace py = boost::python;
 namespace np = boost::python::numpy;
 #endif
diff --git a/src/feature_creation/node/operator_nodes/OperatorNode.cpp b/src/feature_creation/node/operator_nodes/OperatorNode.cpp
index b5a5ac2a..67690c94 100644
--- a/src/feature_creation/node/operator_nodes/OperatorNode.cpp
+++ b/src/feature_creation/node/operator_nodes/OperatorNode.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(OperatorNode)
 
diff --git a/src/feature_creation/node/operator_nodes/OperatorNode.hpp b/src/feature_creation/node/operator_nodes/OperatorNode.hpp
index b699f035..f43fb81f 100644
--- a/src/feature_creation/node/operator_nodes/OperatorNode.hpp
+++ b/src/feature_creation/node/operator_nodes/OperatorNode.hpp
@@ -9,9 +9,7 @@
 #ifndef OPERATOR_NODE
 #define OPERATOR_NODE
 
-#include <feature_creation/node/Node.hpp>
-#include <feature_creation/node/operator_nodes/functions.hpp>
-#include <utils/math_funcs.hpp>
+#include <iomanip>
 
 #include <boost/serialization/base_object.hpp>
 #include <boost/serialization/export.hpp>
@@ -20,14 +18,16 @@
 #include <boost/serialization/array.hpp>
 #include <boost/serialization/vector.hpp>
 
-#include<iomanip>
+#include "feature_creation/node/Node.hpp"
+#include "feature_creation/node/operator_nodes/functions.hpp"
+#include "utils/math_funcs.hpp"
 
 #ifdef PARAMETERIZE
-#include<nl_opt/NLOptWrapper.hpp>
+#include "nl_opt/NLOptWrapper.hpp"
 #endif
 
 #ifdef PY_BINDINGS
-#include <python/conversion_utils.hpp>
+#include "python/conversion_utils.hpp"
 
 namespace py = boost::python;
 namespace np = boost::python::numpy;
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.cpp
index b1f9cd78..cd93a6fc 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp"
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(AbsNode)
 
 void generateAbsNode(
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp
index 299260c6..ce655513 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp
@@ -9,7 +9,7 @@
 #ifndef ABS_VAL_NODE
 #define ABS_VAL_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_abs_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.cpp
index ee580b02..4334be2c 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(AbsParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.hpp
index 06088ada..efd056fd 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_ABS_VAL_NODE
 #define PARAM_ABS_VAL_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.cpp
index 9b1238ab..4afc56de 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.cpp
@@ -1,5 +1,5 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp"
 
 void generateAbsDiffNode(std::vector<node_ptr>& feat_list, const node_ptr feat_1, const node_ptr feat_2, unsigned long int& feat_ind, const double l_bound, const double u_bound)
 {
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp
index daf992ee..12a206c2 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp
@@ -9,7 +9,7 @@
 #ifndef ABS_DIFF_NODE
 #define ABS_DIFF_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_abs_diff_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.cpp
index eedcc449..997af578 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(AbsDiffParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.hpp
index 961355ac..5d70817f 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_ABS_DIFF_NODE
 #define PARAM_ABS_DIFF_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.cpp
index 2e3246ae..e0cd0200 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp"
 
 void generateAddNode(std::vector<node_ptr>& feat_list, const node_ptr feat_1, const node_ptr feat_2, unsigned long int& feat_ind, const double l_bound, const double u_bound)
 {
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp
index 627121af..972d136a 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp
@@ -9,7 +9,7 @@
 #ifndef ADD_NODE
 #define ADD_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_add_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.cpp
index 6d10e556..da5685af 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(AddParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.hpp
index e4846aa1..ed4d726e 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_ADD_NODE
 #define PARAM_ADD_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_param_add_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.cpp
index 1ebbfb7c..8ad4945f 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp"
 
 void generateCbNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp
index d1eb8fd0..79971943 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp
@@ -9,7 +9,7 @@
 #ifndef CB_NODE
 #define CB_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_cb_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.cpp
index 3da7e1c7..ef3aad2b 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(CbParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.hpp
index 1b460923..59681406 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_CUBE_NODE
 #define PARAM_CUBE_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.cpp
index 1c783501..d33db406 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp"
 
 void generateCbrtNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp
index f88e1631..052e093f 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp
@@ -9,7 +9,7 @@
 #ifndef CBRT_NODE
 #define CBRT_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_cbrt_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.cpp
index 87de55f6..3acd047e 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(CbrtParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.hpp
index c22626ca..4201f697 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_CBRT_NODE
 #define PARAM_CBRT_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.cpp
index ae621e30..2bbcaddc 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp"
 
 void generateCosNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp
index e7ee85cb..960f2472 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp
@@ -9,7 +9,7 @@
 #ifndef COS_NODE
 #define COS_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_cos_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.cpp
index bf1f45fe..aa76173b 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(CosParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.hpp
index 78580aba..139c3760 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_COS_NODE
 #define PARAM_COS_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.cpp
index f4314be4..c9dbf13d 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp"
 
 void generateDivNode(std::vector<node_ptr>& feat_list, const node_ptr feat_1, const node_ptr feat_2, unsigned long int& feat_ind, const double l_bound, const double u_bound)
 {
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp
index 253174e2..ff752a80 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp
@@ -9,7 +9,7 @@
 #ifndef DIV_NODE
 #define DIV_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_div_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.cpp
index d6460426..8b9f0103 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(DivParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.hpp
index fbe99494..188b6934 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_DIV_NODE
 #define PARAM_DIV_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_param_add_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.cpp
index 37288b1d..a270e3ab 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp"
 
 void generateExpNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp
index 2d2b5fc1..fa1e3474 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp
@@ -9,7 +9,7 @@
 #ifndef EXP_NODE
 #define EXP_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_exp_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.cpp
index 282d226c..19acd707 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(ExpParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.hpp
index 4cd71ee2..4499b3e9 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_EXP_NODE
 #define PARAM_EXP_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.cpp
index 36e476ea..1ecea585 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp"
 
 void generateInvNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp
index dba801ed..1b526703 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp
@@ -9,7 +9,7 @@
 #ifndef INV_NODE
 #define INV_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_inv_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.cpp
index 86953054..73511e1e 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(InvParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.hpp
index 45595da5..ce707e66 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_INV_NODE
 #define PARAM_INV_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.cpp
index a666f6ac..06e460f1 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp"
 
 void generateLogNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp
index 8029277f..b3268523 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp
@@ -9,7 +9,7 @@
 #ifndef LOG_NODE
 #define LOG_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_log_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.cpp
index b7ea4ad1..7738c1b6 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(LogParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.hpp
index c41c11f8..274225cd 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_LOG_NODE
 #define PARAM_LOG_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.cpp
index 30cbbfa8..84eb9cc5 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp"
 
 void generateMultNode(std::vector<node_ptr>& feat_list, const node_ptr feat_1, const node_ptr feat_2, unsigned long int& feat_ind, const double l_bound, const double u_bound)
 {
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp
index 9eafb9be..4b6f278b 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp
@@ -9,7 +9,7 @@
 #ifndef MULT_NODE
 #define MULT_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_multiplication_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.cpp
index aa6d0fbd..510d3e30 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(MultParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.hpp
index fc05df89..25c9ad14 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_MULT_NODE
 #define PARAM_MULT_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_param_add_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.cpp
index 19327f8d..d41d88dd 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp"
 
 void generateNegExpNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp
index 21ee3928..5410d598 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp
@@ -9,7 +9,7 @@
 #ifndef NEG_EXP_NODE
 #define NEG_EXP_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_neg_exp_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.cpp
index f170303e..de461af9 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(NegExpParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.hpp
index 7fe1651b..8b5e9d2b 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_NEG_EXP_NODE
 #define PARAM_NEG_EXP_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.cpp
index b9664df5..bbcb981b 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(SinParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.hpp
index 45bf07a4..3431a105 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_SIN_NODE
 #define PARAM_SIN_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.cpp
index bcda5422..2e6064c9 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp"
 
 void generateSinNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp
index 2e4e3a3d..50d34148 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp
@@ -9,7 +9,7 @@
 #ifndef SIN_NODE
 #define SIN_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_sin_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.cpp
index c3de1828..c6802360 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(SixPowParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.hpp
index a6dcf36f..de64830c 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_SIX_POW_NODE
 #define PARAM_SIX_POW_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.cpp
index 53bf9805..c78e3041 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp"
 
 void generateSixPowNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp
index ac8dfdc6..359b71f7 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp
@@ -9,7 +9,7 @@
 #ifndef SIXTH_POW_NODE
 #define SIXTH_POW_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_six_pow_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.cpp
index ad56e9db..6d28fca3 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(SqParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.hpp
index a0251406..1b6f0719 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_SQ_NODE
 #define PARAM_SQ_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.cpp
index e856482d..0dd74faf 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp"
 
 void generateSqNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp
index 6ff265f8..ece923b6 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp
@@ -9,7 +9,7 @@
 #ifndef SQ_NODE
 #define SQ_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_sq_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.cpp
index 3c280fcb..3bc12241 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(SqrtParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.hpp
index d0174fc7..1aa32e35 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_SQRT_NODE
 #define PARAM_SQRT_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.cpp
index b7e1c34c..d6b2a091 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp"
 
 void generateSqrtNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp
index c4880d43..d23a831c 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp
@@ -9,7 +9,7 @@
 #ifndef SQRT_NODE
 #define SQRT_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_sqrt_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.cpp
index b8f92391..6c747532 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(SubParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.hpp
index 0c4330eb..9cdfab90 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_SUB_NODE
 #define PARAM_SUB_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_param_add_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.cpp
index fcb3d971..cdae8949 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp"
 
 void generateSubNode(std::vector<node_ptr>& feat_list, const node_ptr feat_1, const node_ptr feat_2, unsigned long int& feat_ind, const double l_bound, const double u_bound)
 {
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp
index 3631dc12..9039a971 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp
@@ -9,9 +9,10 @@
 #ifndef SUB_NODE
 #define SUB_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
 #include <fmt/core.h>
 
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
+
 // DocString: cls_sub_node
 /**
  * @brief Node for the subtraction operator
diff --git a/src/feature_creation/node/operator_nodes/allowed_ops.cpp b/src/feature_creation/node/operator_nodes/allowed_ops.cpp
index e5115555..2fea7d7d 100644
--- a/src/feature_creation/node/operator_nodes/allowed_ops.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_ops.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_ops.hpp>
+#include "feature_creation/node/operator_nodes/allowed_ops.hpp"
 
 std::map<std::string, un_op_node_gen> allowed_op_maps::unary_operator_map;
 std::map<std::string, bin_op_node_gen> allowed_op_maps::binary_operator_map;
diff --git a/src/feature_creation/node/operator_nodes/allowed_ops.hpp b/src/feature_creation/node/operator_nodes/allowed_ops.hpp
index 8676e617..b609fbb9 100644
--- a/src/feature_creation/node/operator_nodes/allowed_ops.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_ops.hpp
@@ -8,41 +8,41 @@
 #define ALLOWED_OP_NODES
 
 #ifdef PARAMETERIZE
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.hpp"
 #else
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp"
 #endif
 
 #include <map>
diff --git a/src/feature_creation/node/operator_nodes/allowed_parameter_ops.cpp b/src/feature_creation/node/operator_nodes/allowed_parameter_ops.cpp
index 17fea3f1..719d6318 100644
--- a/src/feature_creation/node/operator_nodes/allowed_parameter_ops.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_parameter_ops.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_ops.hpp>
+#include "feature_creation/node/operator_nodes/allowed_ops.hpp"
 
 std::map<std::string, un_param_op_node_gen> allowed_op_maps::unary_param_operator_map;
 std::map<std::string, bin_param_op_node_gen> allowed_op_maps::binary_param_operator_map;
diff --git a/src/feature_creation/node/utils.cpp b/src/feature_creation/node/utils.cpp
index c87aa906..cff33488 100644
--- a/src/feature_creation/node/utils.cpp
+++ b/src/feature_creation/node/utils.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/utils.hpp>
+#include "feature_creation/node/utils.hpp"
 
 #ifdef PARAMETERIZE
 void str2node::set_parameters(node_ptr feat, const std::vector<std::string> op_terms)
diff --git a/src/feature_creation/node/utils.hpp b/src/feature_creation/node/utils.hpp
index b3c7567d..547efe2c 100644
--- a/src/feature_creation/node/utils.hpp
+++ b/src/feature_creation/node/utils.hpp
@@ -8,12 +8,12 @@
 #define NODE_UTILS
 
 #include <fstream>
-#include <feature_creation/node/FeatureNode.hpp>
-#include <feature_creation/node/ModelNode.hpp>
-#include <feature_creation/node/operator_nodes/allowed_ops.hpp>
-#include <feature_creation/node/value_storage/nodes_value_containers.hpp>
 
-#include <utils/string_utils.hpp>
+#include "feature_creation/node/FeatureNode.hpp"
+#include "feature_creation/node/ModelNode.hpp"
+#include "feature_creation/node/operator_nodes/allowed_ops.hpp"
+#include "feature_creation/node/value_storage/nodes_value_containers.hpp"
+#include "utils/string_utils.hpp"
 
 namespace str2node
 {
diff --git a/src/feature_creation/node/value_storage/nodes_value_containers.cpp b/src/feature_creation/node/value_storage/nodes_value_containers.cpp
index ba603c17..06b10625 100644
--- a/src/feature_creation/node/value_storage/nodes_value_containers.cpp
+++ b/src/feature_creation/node/value_storage/nodes_value_containers.cpp
@@ -1,5 +1,4 @@
-#include <feature_creation/node/value_storage/nodes_value_containers.hpp>
-#include <iostream>
+#include "feature_creation/node/value_storage/nodes_value_containers.hpp"
 
 int node_value_arrs::N_SELECTED = 0;
 int node_value_arrs::N_SAMPLES = 0;
diff --git a/src/feature_creation/node/value_storage/nodes_value_containers.hpp b/src/feature_creation/node/value_storage/nodes_value_containers.hpp
index 6f0937bf..a0b1039c 100644
--- a/src/feature_creation/node/value_storage/nodes_value_containers.hpp
+++ b/src/feature_creation/node/value_storage/nodes_value_containers.hpp
@@ -19,7 +19,7 @@
 
 #include <omp.h>
 
-#include<utils/enum.hpp>
+#include"utils/enum.hpp"
 
 namespace node_value_arrs
 {
diff --git a/src/feature_creation/units/Unit.cpp b/src/feature_creation/units/Unit.cpp
index 91cf989a..72a822e0 100644
--- a/src/feature_creation/units/Unit.cpp
+++ b/src/feature_creation/units/Unit.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/units/Unit.hpp>
+#include "feature_creation/units/Unit.hpp"
 
 Unit::Unit() :
     _dct()
diff --git a/src/feature_creation/units/Unit.hpp b/src/feature_creation/units/Unit.hpp
index f6189df2..810885db 100644
--- a/src/feature_creation/units/Unit.hpp
+++ b/src/feature_creation/units/Unit.hpp
@@ -22,7 +22,7 @@
 #include <boost/serialization/map.hpp>
 #include <boost/serialization/string.hpp>
 
-#include <utils/string_utils.hpp>
+#include "utils/string_utils.hpp"
 
 using StringRange = boost::iterator_range<std::string::const_iterator>;
 
diff --git a/src/inputs/InputParser.cpp b/src/inputs/InputParser.cpp
index 0ac618f5..d568c109 100644
--- a/src/inputs/InputParser.cpp
+++ b/src/inputs/InputParser.cpp
@@ -1,4 +1,4 @@
-#include <inputs/InputParser.hpp>
+#include "inputs/InputParser.hpp"
 
 InputParser::InputParser(pt::ptree IP, std::string fn, std::shared_ptr<MPI_Interface> comm) :
     _opset(as_vector<std::string>(IP, "opset")),
diff --git a/src/inputs/InputParser.hpp b/src/inputs/InputParser.hpp
index e0b00ea6..39fedcad 100644
--- a/src/inputs/InputParser.hpp
+++ b/src/inputs/InputParser.hpp
@@ -23,8 +23,8 @@
 #include <random>
 #include <chrono>
 
-#include <feature_creation/feature_space/FeatureSpace.hpp>
-#include <feature_creation/node/value_storage/nodes_value_containers.hpp>
+#include "feature_creation/feature_space/FeatureSpace.hpp"
+#include "feature_creation/node/value_storage/nodes_value_containers.hpp"
 
 namespace pt = boost::property_tree;
 
diff --git a/src/main.cpp b/src/main.cpp
index 06c0ce1f..584c2e58 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,18 +1,15 @@
-#include <inputs/InputParser.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSORegressor.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSOClassifier.hpp>
 #include <iostream>
-// #include <gflags/gflags.h>
+
+#include "inputs/InputParser.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSORegressor.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSOClassifier.hpp"
 
 int main(int argc, char const *argv[])
 {
 
     allowed_op_maps::set_node_maps();
     #ifdef PARAMETERIZE
-        // google::InitGoogleLogging("XXX");
-        // google::SetCommandLineOption("GLOG_minloglevel", "3");
-        // google::SetCommandLineOption("stderrthreshold", "3");
         allowed_op_maps::set_param_node_maps();
     #endif
 
diff --git a/src/mpi_interface/MPI_Interface.cpp b/src/mpi_interface/MPI_Interface.cpp
index ad56fdb3..96b7b3af 100644
--- a/src/mpi_interface/MPI_Interface.cpp
+++ b/src/mpi_interface/MPI_Interface.cpp
@@ -1,4 +1,4 @@
-#include <mpi_interface/MPI_Interface.hpp>
+#include "mpi_interface/MPI_Interface.hpp"
 
 MPI_Interface::MPI_Interface() : boost::mpi::communicator()
 {}
diff --git a/src/mpi_interface/MPI_ops.cpp b/src/mpi_interface/MPI_ops.cpp
index e647fc3f..543cbc48 100644
--- a/src/mpi_interface/MPI_ops.cpp
+++ b/src/mpi_interface/MPI_ops.cpp
@@ -1,4 +1,4 @@
-#include<mpi_interface/MPI_ops.hpp>
+#include "mpi_interface/MPI_ops.hpp"
 
 // MPI_Op top_feats;
 std::function<bool(const double*, const int, const double, const std::vector<node_sc_pair>&, const double)> mpi_reduce_op::IS_VALID;
diff --git a/src/mpi_interface/MPI_ops.hpp b/src/mpi_interface/MPI_ops.hpp
index 7441e263..6a2b7ea7 100644
--- a/src/mpi_interface/MPI_ops.hpp
+++ b/src/mpi_interface/MPI_ops.hpp
@@ -10,8 +10,9 @@
 #define SISSO_MPI_OPS
 
 #include <boost/mpi.hpp>
-#include <feature_creation/node/Node.hpp>
-#include <utils/compare_features.hpp>
+
+#include "feature_creation/node/Node.hpp"
+#include "utils/compare_features.hpp"
 
 namespace mpi_reduce_op
 {
diff --git a/src/nl_opt/NLOptWrapper.cpp b/src/nl_opt/NLOptWrapper.cpp
index 9487dcdf..cd258a6c 100644
--- a/src/nl_opt/NLOptWrapper.cpp
+++ b/src/nl_opt/NLOptWrapper.cpp
@@ -1,4 +1,5 @@
-#include <nl_opt/NLOptWrapper.hpp>
+#include "nl_opt/NLOptWrapper.hpp"
+
 int nlopt_wrapper::MAX_PARAM_DEPTH = -1;
 NLOptimizer::NLOptimizer(
     const std::vector<int>& task_sizes,
diff --git a/src/nl_opt/NLOptWrapper.hpp b/src/nl_opt/NLOptWrapper.hpp
index f288cfdd..f262e5f3 100644
--- a/src/nl_opt/NLOptWrapper.hpp
+++ b/src/nl_opt/NLOptWrapper.hpp
@@ -8,8 +8,8 @@
 #define NL_OPT_WRAPPER
 
 #include <nlopt.hpp>
-#include <feature_creation/node/Node.hpp>
-#include <classification/ConvexHull1D.hpp>
+#include "feature_creation/node/Node.hpp"
+#include "classification/ConvexHull1D.hpp"
 
 class NLOptimizer
 {
diff --git a/src/python/bindings_docstring_keyed.cpp b/src/python/bindings_docstring_keyed.cpp
index 91ddcc9c..f2810228 100644
--- a/src/python/bindings_docstring_keyed.cpp
+++ b/src/python/bindings_docstring_keyed.cpp
@@ -1,4 +1,4 @@
-#include <python/bindings.hpp>
+#include "python/bindings.hpp"
 
 using namespace boost::python;
 
diff --git a/src/python/bindings_docstring_keyed.hpp b/src/python/bindings_docstring_keyed.hpp
index c459f2fa..1bded860 100644
--- a/src/python/bindings_docstring_keyed.hpp
+++ b/src/python/bindings_docstring_keyed.hpp
@@ -7,13 +7,13 @@
 #ifndef PYTHON_BINDING
 #define PYTHON_BINDINGS
 
-#include <descriptor_identifier/SISSO_DI/SISSO_DI.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSORegressor.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSOClassifier.hpp>
-#include <feature_creation/feature_space/FeatureSpace.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
-#include <python/feature_creation/node_utils.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSO_DI.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSORegressor.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSOClassifier.hpp"
+#include "feature_creation/feature_space/FeatureSpace.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
+#include "python/feature_creation/node_utils.hpp"
 
 namespace py = boost::python;
 namespace np = boost::python::numpy;
diff --git a/src/python/conversion_utils.hpp b/src/python/conversion_utils.hpp
index 28494302..94898cf9 100644
--- a/src/python/conversion_utils.hpp
+++ b/src/python/conversion_utils.hpp
@@ -9,13 +9,13 @@
 
 #include <algorithm>
 #include <array>
+#include <iostream>
+#include <map>
 #include <vector>
+
 #include <boost/python.hpp>
 #include <boost/python/numpy.hpp>
 
-#include <iostream>
-#include <map>
-
 namespace python_conv_utils
 {
     namespace py = boost::python;
diff --git a/src/python/descriptor_identifier/Model.cpp b/src/python/descriptor_identifier/Model.cpp
index 2af0586f..d1778521 100644
--- a/src/python/descriptor_identifier/Model.cpp
+++ b/src/python/descriptor_identifier/Model.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/Model/Model.hpp>
+#include "descriptor_identifier/Model/Model.hpp"
 
 np::ndarray Model::eval_many_py(np::ndarray x_in) const
 {
diff --git a/src/python/descriptor_identifier/ModelClassifier.cpp b/src/python/descriptor_identifier/ModelClassifier.cpp
index d5a0555f..a6dd3c52 100644
--- a/src/python/descriptor_identifier/ModelClassifier.cpp
+++ b/src/python/descriptor_identifier/ModelClassifier.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/Model/ModelClassifier.hpp>
+#include "descriptor_identifier/Model/ModelClassifier.hpp"
 
 ModelClassifier::ModelClassifier(const ModelClassifier& o, py::list new_coefs, np::ndarray prop_train_est, np::ndarray prop_test_est) :
     Model(o),
diff --git a/src/python/descriptor_identifier/SISSOClassifier.cpp b/src/python/descriptor_identifier/SISSOClassifier.cpp
index ce949e2a..a4857b06 100644
--- a/src/python/descriptor_identifier/SISSOClassifier.cpp
+++ b/src/python/descriptor_identifier/SISSOClassifier.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/SISSO_DI/SISSOClassifier.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSOClassifier.hpp"
 
 SISSOClassifier::SISSOClassifier(
     std::shared_ptr<FeatureSpace> feat_space,
diff --git a/src/python/descriptor_identifier/SISSOLogRegressor.cpp b/src/python/descriptor_identifier/SISSOLogRegressor.cpp
index 97b56c24..97ff8ad1 100644
--- a/src/python/descriptor_identifier/SISSOLogRegressor.cpp
+++ b/src/python/descriptor_identifier/SISSOLogRegressor.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp"
 
 SISSOLogRegressor::SISSOLogRegressor(
     std::shared_ptr<FeatureSpace> feat_space,
diff --git a/src/python/descriptor_identifier/SISSORegressor.cpp b/src/python/descriptor_identifier/SISSORegressor.cpp
index 2b88aa10..98c507d1 100644
--- a/src/python/descriptor_identifier/SISSORegressor.cpp
+++ b/src/python/descriptor_identifier/SISSORegressor.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/SISSO_DI/SISSORegressor.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSORegressor.hpp"
 
 SISSORegressor::SISSORegressor(
     std::shared_ptr<FeatureSpace> feat_space,
diff --git a/src/python/descriptor_identifier/SISSO_DI.cpp b/src/python/descriptor_identifier/SISSO_DI.cpp
index c7920cc4..4d8998cb 100644
--- a/src/python/descriptor_identifier/SISSO_DI.cpp
+++ b/src/python/descriptor_identifier/SISSO_DI.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/SISSO_DI/SISSO_DI.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSO_DI.hpp"
 
 SISSO_DI::SISSO_DI(
     std::shared_ptr<FeatureSpace> feat_space,
diff --git a/src/python/feature_creation/FeatureNode.cpp b/src/python/feature_creation/FeatureNode.cpp
index d4c84529..998e720c 100644
--- a/src/python/feature_creation/FeatureNode.cpp
+++ b/src/python/feature_creation/FeatureNode.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/FeatureNode.hpp>
+#include "feature_creation/node/FeatureNode.hpp"
 
 FeatureNode::FeatureNode(unsigned long int feat_ind, std::string expr, np::ndarray value, np::ndarray test_value, Unit unit) :
     Node(feat_ind, value.shape(0), test_value.shape(0)),
diff --git a/src/python/feature_creation/FeatureSpace.cpp b/src/python/feature_creation/FeatureSpace.cpp
index 1bf62188..15be757a 100644
--- a/src/python/feature_creation/FeatureSpace.cpp
+++ b/src/python/feature_creation/FeatureSpace.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/feature_space/FeatureSpace.hpp>
+#include "feature_creation/feature_space/FeatureSpace.hpp"
 
 #ifdef PARAMETERIZE
 FeatureSpace::FeatureSpace(
diff --git a/src/python/feature_creation/ModelNode.cpp b/src/python/feature_creation/ModelNode.cpp
index f98ed0e5..e48203c3 100644
--- a/src/python/feature_creation/ModelNode.cpp
+++ b/src/python/feature_creation/ModelNode.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/ModelNode.hpp>
+#include "feature_creation/node/ModelNode.hpp"
 
 np::ndarray ModelNode::eval_many_py(np::ndarray x_in)
 {
diff --git a/src/python/feature_creation/node_utils.cpp b/src/python/feature_creation/node_utils.cpp
index 5411a1d0..bd844593 100644
--- a/src/python/feature_creation/node_utils.cpp
+++ b/src/python/feature_creation/node_utils.cpp
@@ -1,4 +1,4 @@
-#include <python/feature_creation/node_utils.hpp>
+#include "python/feature_creation/node_utils.hpp"
 
 py::list str2node::phi_selected_from_file_py(std::string filename, py::list phi_0)
 {
diff --git a/src/python/feature_creation/node_utils.hpp b/src/python/feature_creation/node_utils.hpp
index 5d3d7e9a..149e3e3d 100644
--- a/src/python/feature_creation/node_utils.hpp
+++ b/src/python/feature_creation/node_utils.hpp
@@ -7,7 +7,7 @@
 #ifndef NODE_UTILS_PY
 #define NODE_UTILS_PY
 
-#include <feature_creation/node/utils.hpp>
+#include "feature_creation/node/utils.hpp"
 
 namespace py = boost::python;
 
@@ -25,4 +25,4 @@ namespace str2node
     py::list phi_selected_from_file_py(std::string filename, py::list phi_0);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/utils/compare_features.cpp b/src/utils/compare_features.cpp
index eb991c72..024ec5bb 100644
--- a/src/utils/compare_features.cpp
+++ b/src/utils/compare_features.cpp
@@ -1,4 +1,4 @@
-#include <utils/compare_features.hpp>
+#include "utils/compare_features.hpp"
 std::vector<double> comp_feats::CORR_CHECK;
 std::vector<double> comp_feats::RANK;
 std::vector<int> comp_feats::INDEX;
diff --git a/src/utils/compare_features.hpp b/src/utils/compare_features.hpp
index d21d806c..955fa397 100644
--- a/src/utils/compare_features.hpp
+++ b/src/utils/compare_features.hpp
@@ -9,7 +9,7 @@
 
 #include <tuple>
 
-#include <feature_creation/node/Node.hpp>
+#include "feature_creation/node/Node.hpp"
 
 typedef std::tuple<node_ptr, double> node_sc_pair;
 
diff --git a/src/utils/math_funcs.cpp b/src/utils/math_funcs.cpp
index b853a0e2..1efd66c1 100644
--- a/src/utils/math_funcs.cpp
+++ b/src/utils/math_funcs.cpp
@@ -1,4 +1,4 @@
-#include <utils/math_funcs.hpp>
+#include "utils/math_funcs.hpp"
 
 bool util_funcs::iterate(std::vector<int>& inds, int size, int incriment)
 {
diff --git a/src/utils/math_funcs.hpp b/src/utils/math_funcs.hpp
index c5051634..80ccd010 100644
--- a/src/utils/math_funcs.hpp
+++ b/src/utils/math_funcs.hpp
@@ -9,12 +9,12 @@
 
 #include <algorithm>
 #include <functional>
+#include <iostream>
 #include <numeric>
 #include <vector>
 #include <math.h>
-#include <utils/mkl_interface.hpp>
 
-#include<iostream>
+#include "utils/mkl_interface.hpp"
 
 namespace util_funcs
 {
diff --git a/src/utils/project.cpp b/src/utils/project.cpp
index c79fb028..376e9bbf 100644
--- a/src/utils/project.cpp
+++ b/src/utils/project.cpp
@@ -1,4 +1,4 @@
-#include <utils/project.hpp>
+#include "utils/project.hpp"
 
 void project_funcs::set_project_fxn(
     const std::string project_type,
diff --git a/src/utils/project.hpp b/src/utils/project.hpp
index 1ddf020a..f3ac9151 100644
--- a/src/utils/project.hpp
+++ b/src/utils/project.hpp
@@ -11,10 +11,10 @@
 #include <iostream>
 #include <omp.h>
 
-#include <classification/ConvexHull1D.hpp>
-#include <feature_creation/node/Node.hpp>
+#include "classification/ConvexHull1D.hpp"
+#include "feature_creation/node/Node.hpp"
 #ifdef PARAMETERIZE
-#include <nl_opt/NLOptWrapper.hpp>
+#include "nl_opt/NLOptWrapper.hpp"
 #endif
 
 namespace project_funcs
diff --git a/src/utils/string_utils.cpp b/src/utils/string_utils.cpp
index 7fd20aa7..e7b71b8c 100644
--- a/src/utils/string_utils.cpp
+++ b/src/utils/string_utils.cpp
@@ -1,4 +1,4 @@
-#include <utils/string_utils.hpp>
+#include "utils/string_utils.hpp"
 
 std::vector<std::string> str_utils::split_string_trim(const std::string str, const std::string split_tokens)
 {
-- 
GitLab