diff --git a/src/mmoc/ast/ast_builder.cpp b/src/mmoc/ast/ast_builder.cpp
index f8b2cadb..bb93a849 100644
--- a/src/mmoc/ast/ast_builder.cpp
+++ b/src/mmoc/ast/ast_builder.cpp
@@ -24,18 +24,18 @@
 #include <list>
 #include <string>
 
-#include "ast_builder.h"
+#include "ast_builder.hpp"
 #include <ast/parser/mocc_parser.h>
-#include "ast_types.h"
-#include "../util/ast_util.h"
-#include "class.h"
-#include "composition.h"
-#include "element.h"
-#include "equation.h"
-#include "expression.h"
-#include "modification.h"
-#include "statement.h"
-#include "stored_definition.h"
+#include "ast_types.hpp"
+#include "../util/ast_util.hpp"
+#include "class.hpp"
+#include "composition.hpp"
+#include "element.hpp"
+#include "equation.hpp"
+#include "expression.hpp"
+#include "modification.hpp"
+#include "statement.hpp"
+#include "stored_definition.hpp"
 
 class MCC_Parser;
 class MCC_Lexer;
diff --git a/src/mmoc/ast/ast_builder.hpp b/src/mmoc/ast/ast_builder.hpp
index a6c45335..023ca54b 100644
--- a/src/mmoc/ast/ast_builder.hpp
+++ b/src/mmoc/ast/ast_builder.hpp
@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include "ast_types.h"
+#include "ast_types.hpp"
 
 /* Constructors */
 AST_ArgumentList newAST_ArgumentList();
diff --git a/src/mmoc/ast/ast_node.cpp b/src/mmoc/ast/ast_node.cpp
index eb9c5f59..e5840af4 100644
--- a/src/mmoc/ast/ast_node.cpp
+++ b/src/mmoc/ast/ast_node.cpp
@@ -17,7 +17,7 @@
 
  ******************************************************************************/
 
-#include "ast_node.h"
+#include "ast_node.hpp"
 
 #include <iostream>
 #include <sstream>
diff --git a/src/mmoc/ast/ast_node.hpp b/src/mmoc/ast/ast_node.hpp
index 7b655cff..528e52f6 100644
--- a/src/mmoc/ast/ast_node.hpp
+++ b/src/mmoc/ast/ast_node.hpp
@@ -19,8 +19,8 @@
 
 #pragma once 
 
-#include "../util/macros.h"
-#include "../util/util_types.h"
+#include "../util/macros.hpp"
+#include "../util/util_types.hpp"
 
 class AST_Visitor;
 
diff --git a/src/mmoc/ast/ast_printer.hpp b/src/mmoc/ast/ast_printer.hpp
index 9d3da564..96aae996 100644
--- a/src/mmoc/ast/ast_printer.hpp
+++ b/src/mmoc/ast/ast_printer.hpp
@@ -19,8 +19,8 @@
 
 #pragme once
 
-#include <ast/ast_types.h>
-#include <util/macros.h>
+#include <ast/ast_types.hpp>
+#include <util/macros.hpp>
 
 using namespace std;
 
diff --git a/src/mmoc/ast/ast_types.hpp b/src/mmoc/ast/ast_types.hpp
index 4d831998..757bf313 100644
--- a/src/mmoc/ast/ast_types.hpp
+++ b/src/mmoc/ast/ast_types.hpp
@@ -25,7 +25,7 @@
 #include <set>
 #include <string>
 
-#include "../util/macros.h"
+#include "../util/macros.hpp"
 
 #define MAKE_SPACE \
   for (int __i = 0; __i < block; __i++) ret << " ";
diff --git a/src/mmoc/ast/class.cpp b/src/mmoc/ast/class.cpp
index 90ceb13f..f95b4fd8 100644
--- a/src/mmoc/ast/class.cpp
+++ b/src/mmoc/ast/class.cpp
@@ -17,16 +17,16 @@
 
  ******************************************************************************/
 
-#include "class.h"
+#include "class.hpp"
 
 #include <stddef.h>
 #include <iostream>
 #include <list>
 
-#include "../util/ast_util.h"
-#include "ast_builder.h"
-#include "composition.h"
-#include "element.h"
+#include "../util/ast_util.hpp"
+#include "ast_builder.hpp"
+#include "composition.hpp"
+#include "element.hpp"
 
 AST_Class_::AST_Class_(AST_String n, AST_Composition comp)
     : _name(n), _composition(comp), _father(nullptr), _basic(false), _encapsulated(false), _final(false), _prefix()
diff --git a/src/mmoc/ast/class.hpp b/src/mmoc/ast/class.hpp
index d6ae9d34..12127ca8 100644
--- a/src/mmoc/ast/class.hpp
+++ b/src/mmoc/ast/class.hpp
@@ -20,10 +20,10 @@
 #ifndef AST_CLASS_H_
 #define AST_CLASS_H_
 
-#include "../util/macros.h"
-#include "../util/util_types.h"
-#include "ast_node.h"
-#include "ast_types.h"
+#include "../util/macros.hpp"
+#include "../util/util_types.hpp"
+#include "ast_node.hpp"
+#include "ast_types.hpp"
 
 class AST_Class_ : public AST_Node_ {
   public:
diff --git a/src/mmoc/ast/composition.cpp b/src/mmoc/ast/composition.cpp
index 9171bb4e..364ffcf9 100644
--- a/src/mmoc/ast/composition.cpp
+++ b/src/mmoc/ast/composition.cpp
@@ -17,18 +17,18 @@
 
  ******************************************************************************/
 
-#include "composition.h"
+#include "composition.hpp"
 
 #include <iostream>
 #include <list>
 
-#include "../util/ast_util.h"
-#include "ast_builder.h"
-#include "element.h"
-#include "equation.h"
-#include "expression.h"
-#include "modification.h"
-#include "statement.h"
+#include "../util/ast_util.hpp"
+#include "ast_builder.hpp"
+#include "element.hpp"
+#include "equation.hpp"
+#include "expression.hpp"
+#include "modification.hpp"
+#include "statement.hpp"
 
 /* Composition Class */
 
diff --git a/src/mmoc/ast/composition.hpp b/src/mmoc/ast/composition.hpp
index 74be7a7a..37d05179 100644
--- a/src/mmoc/ast/composition.hpp
+++ b/src/mmoc/ast/composition.hpp
@@ -22,10 +22,10 @@
 
 #include <string>
 
-#include "../util/macros.h"
-#include "../util/util_types.h"
-#include "ast_node.h"
-#include "ast_types.h"
+#include "../util/macros.hpp"
+#include "../util/util_types.hpp"
+#include "ast_node.hpp"
+#include "ast_types.hpp"
 
 class AST_CompositionElement_;
 
diff --git a/src/mmoc/ast/element.cpp b/src/mmoc/ast/element.cpp
index 53a18e9d..f8f872ac 100644
--- a/src/mmoc/ast/element.cpp
+++ b/src/mmoc/ast/element.cpp
@@ -17,14 +17,14 @@
 
  ******************************************************************************/
 
-#include "element.h"
+#include "element.hpp"
 
 #include <list>
 #include <sstream>
 
-#include "class.h"
-#include "modification.h"
-#include "../util/ast_util.h"
+#include "class.hpp"
+#include "modification.hpp"
+#include "../util/ast_util.hpp"
 
 using namespace std;
 
diff --git a/src/mmoc/ast/element.hpp b/src/mmoc/ast/element.hpp
index e6b5b46a..1dcba0b5 100644
--- a/src/mmoc/ast/element.hpp
+++ b/src/mmoc/ast/element.hpp
@@ -22,10 +22,10 @@
 
 #include <string>
 
-#include "../util/macros.h"
-#include "../util/util_types.h"
-#include "ast_node.h"
-#include "ast_types.h"
+#include "../util/macros.hpp"
+#include "../util/util_types.hpp"
+#include "ast_node.hpp"
+#include "ast_types.hpp"
 
 class AST_Element_ : public AST_Node_ {
   public:
diff --git a/src/mmoc/ast/equation.cpp b/src/mmoc/ast/equation.cpp
index 1da638a9..256b743c 100644
--- a/src/mmoc/ast/equation.cpp
+++ b/src/mmoc/ast/equation.cpp
@@ -17,13 +17,13 @@
 
  ******************************************************************************/
 
-#include "equation.h"
+#include "equation.hpp"
 
 #include <list>
 #include <sstream>
 
-#include "../util/ast_util.h"
-#include "expression.h"
+#include "../util/ast_util.hpp"
+#include "expression.hpp"
 
 /* Equation Class */
 
diff --git a/src/mmoc/ast/equation.hpp b/src/mmoc/ast/equation.hpp
index d2ca932a..91aa1197 100644
--- a/src/mmoc/ast/equation.hpp
+++ b/src/mmoc/ast/equation.hpp
@@ -21,11 +21,11 @@
 
 #include <string>
 
-#include <ast/ast_node.h>
-#include <ast/ast_types.h>
-#include <ast/element.h>
-#include <util/macros.h>
-#include <util/util_types.h>
+#include <ast/ast_node.hpp>
+#include <ast/ast_types.hpp>
+#include <ast/element.hpp>
+#include <util/macros.hpp>
+#include <util/util_types.hpp>
 
 class AST_Equation_ : public AST_Node_ {
   public:
diff --git a/src/mmoc/ast/expression.cpp b/src/mmoc/ast/expression.cpp
index 53e665ed..04ce6aea 100644
--- a/src/mmoc/ast/expression.cpp
+++ b/src/mmoc/ast/expression.cpp
@@ -17,13 +17,13 @@
 
  ******************************************************************************/
 
-#include "expression.h"
+#include "expression.hpp"
 
 #include <list>
 #include <sstream>
 
-#include "../util/ast_util.h"
-#include "ast_builder.h"
+#include "../util/ast_util.hpp"
+#include "ast_builder.hpp"
 
 const char *BinOpTypeName[] = {" or ", " and ", "<", "<=", ">", ">=", "<>", "==", "+", ".+", "-", ".-", "/", "./", "*", ".*", "^", ".^"};
 
diff --git a/src/mmoc/ast/expression.hpp b/src/mmoc/ast/expression.hpp
index a8bd01e7..10e772e2 100644
--- a/src/mmoc/ast/expression.hpp
+++ b/src/mmoc/ast/expression.hpp
@@ -22,10 +22,10 @@
 
 #include <string>
 
-#include "../util/macros.h"
-#include "../util/util_types.h"
-#include "ast_node.h"
-#include "ast_types.h"
+#include "../util/macros.hpp"
+#include "../util/util_types.hpp"
+#include "ast_node.hpp"
+#include "ast_types.hpp"
 
 class AST_Expression_ : public AST_Node_ {
   public:
diff --git a/src/mmoc/ast/imports.cpp b/src/mmoc/ast/imports.cpp
index 4c6c2914..feae5dec 100644
--- a/src/mmoc/ast/imports.cpp
+++ b/src/mmoc/ast/imports.cpp
@@ -1,10 +1,10 @@
-#include "imports.h"
+#include "imports.hpp"
 
 #include <list>
 
-#include "ast_builder.h"
-#include "class.h"
-#include "element.h"
+#include "ast_builder.hpp"
+#include "class.hpp"
+#include "element.hpp"
 
 AST_Imports::AST_Imports() { _imports = newAST_StringList(); }
 
diff --git a/src/mmoc/ast/imports.hpp b/src/mmoc/ast/imports.hpp
index 10204510..75c4098b 100644
--- a/src/mmoc/ast/imports.hpp
+++ b/src/mmoc/ast/imports.hpp
@@ -20,8 +20,8 @@
 #ifndef IMPORTS_H_
 #define IMPORTS_H_
 
-#include "../util/ast_util.h"
-#include "ast_types.h"
+#include "../util/ast_util.hpp"
+#include "ast_types.hpp"
 
 /**
  *
diff --git a/src/mmoc/ast/modification.cpp b/src/mmoc/ast/modification.cpp
index d2625835..a55c9a20 100644
--- a/src/mmoc/ast/modification.cpp
+++ b/src/mmoc/ast/modification.cpp
@@ -17,13 +17,13 @@
 
  ******************************************************************************/
 
-#include "modification.h"
+#include "modification.hpp"
 
 #include <list>
 #include <sstream>
 
-#include "../util/ast_util.h"
-#include "expression.h"
+#include "../util/ast_util.hpp"
+#include "expression.hpp"
 
 /* Argument Class */
 
diff --git a/src/mmoc/ast/modification.hpp b/src/mmoc/ast/modification.hpp
index 542791ba..d9b211e5 100644
--- a/src/mmoc/ast/modification.hpp
+++ b/src/mmoc/ast/modification.hpp
@@ -22,10 +22,10 @@
 
 #include <string>
 
-#include "../util/macros.h"
-#include "../util/util_types.h"
-#include "ast_node.h"
-#include "ast_types.h"
+#include "../util/macros.hpp"
+#include "../util/util_types.hpp"
+#include "ast_node.hpp"
+#include "ast_types.hpp"
 
 /**
  *
diff --git a/src/mmoc/ast/parser/config.hpp b/src/mmoc/ast/parser/config.h
similarity index 100%
rename from src/mmoc/ast/parser/config.hpp
rename to src/mmoc/ast/parser/config.h
diff --git a/src/mmoc/ast/parser/mocc.lex b/src/mmoc/ast/parser/mocc.lex
index e3d8778f..76ca8dfe 100644
--- a/src/mmoc/ast/parser/mocc.lex
+++ b/src/mmoc/ast/parser/mocc.lex
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include "config.h"
+#include <ast/parser/config.h>
 #include <ast/parser/mocc_parser.h>
 
 #ifdef MCC_Lexer_DEBUG
diff --git a/src/mmoc/ast/parser/mocc.y b/src/mmoc/ast/parser/mocc.y
index 7376b1ab..13461855 100644
--- a/src/mmoc/ast/parser/mocc.y
+++ b/src/mmoc/ast/parser/mocc.y
@@ -17,7 +17,7 @@
 %header{
 #include <FlexLexer.h>
 #include <string.h>
-#include <ast/ast_builder.h>
+#include <ast/ast_builder.hpp>
 
 class MCC_Lexer: public yyFlexLexer {
 public:
diff --git a/src/mmoc/ast/parser/parse.cpp b/src/mmoc/ast/parser/parse.cpp
index 17c5ac9e..014d4c3a 100644
--- a/src/mmoc/ast/parser/parse.cpp
+++ b/src/mmoc/ast/parser/parse.cpp
@@ -17,7 +17,7 @@
 
  ******************************************************************************/
 
-#include "parse.h"
+#include "parse.hpp"
 
 #include <cstdlib>
 #include <fstream>
@@ -25,11 +25,10 @@
 #include <list>
 #include <string>
 
-#include <ast/ast_types.h>
-#include <ast/class.h>
-#include <ast/composition.h>
-#include <ast/equation.h>
-#include <ast/stored_definition.h>
+#include <ast/class.hpp>
+#include <ast/composition.hpp>
+#include <ast/equation.hpp>
+#include <ast/stored_definition.hpp>
 #include <ast/parser/mocc_parser.h>
 
 using namespace std;
diff --git a/src/mmoc/ast/parser/parse.hpp b/src/mmoc/ast/parser/parse.hpp
index 7e38b49d..8659bc48 100644
--- a/src/mmoc/ast/parser/parse.hpp
+++ b/src/mmoc/ast/parser/parse.hpp
@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include <ast/ast_types.h>
+#include <ast/ast_types.hpp>
 
 AST_StoredDefinition parseFile(string, int *);
 
diff --git a/src/mmoc/ast/statement.cpp b/src/mmoc/ast/statement.cpp
index 078c49c8..10dc7e79 100644
--- a/src/mmoc/ast/statement.cpp
+++ b/src/mmoc/ast/statement.cpp
@@ -17,14 +17,14 @@
 
  ******************************************************************************/
 
-#include "statement.h"
+#include "statement.hpp"
 
 #include <list>
 #include <sstream>
 
-#include "../util/ast_util.h"
-#include "element.h"
-#include "expression.h"
+#include "../util/ast_util.hpp"
+#include "element.hpp"
+#include "expression.hpp"
 
 /* Statement Class */
 
diff --git a/src/mmoc/ast/statement.hpp b/src/mmoc/ast/statement.hpp
index efc07e7e..4260f96d 100644
--- a/src/mmoc/ast/statement.hpp
+++ b/src/mmoc/ast/statement.hpp
@@ -22,10 +22,10 @@
 
 #include <string>
 
-#include "../util/macros.h"
-#include "../util/util_types.h"
-#include "ast_node.h"
-#include "ast_types.h"
+#include "../util/macros.hpp"
+#include "../util/util_types.hpp"
+#include "ast_node.hpp"
+#include "ast_types.hpp"
 
 class AST_Statement_ : public AST_Node_ {
   public:
diff --git a/src/mmoc/ast/stored_definition.cpp b/src/mmoc/ast/stored_definition.cpp
index 23e5ac09..e24eb185 100644
--- a/src/mmoc/ast/stored_definition.cpp
+++ b/src/mmoc/ast/stored_definition.cpp
@@ -17,14 +17,14 @@
 
  ******************************************************************************/
 
-#include "stored_definition.h"
+#include "stored_definition.hpp"
 
 #include <stddef.h>
 #include <iostream>
 #include <list>
 
-#include "class.h"
-#include "imports.h"
+#include "class.hpp"
+#include "imports.hpp"
 
 AST_StoredDefinition_::AST_StoredDefinition_(AST_ClassList ml, AST_String within) : _model_list(ml), _within(within)
 {
diff --git a/src/mmoc/ast/stored_definition.hpp b/src/mmoc/ast/stored_definition.hpp
index d0906bb8..384ccc6d 100644
--- a/src/mmoc/ast/stored_definition.hpp
+++ b/src/mmoc/ast/stored_definition.hpp
@@ -19,10 +19,10 @@
 
 #pragma once 
 
-#include <util/macros.h>
-#include <util/util_types.h>
-#include <ast/ast_node.h>
-#include <ast/ast_types.h>
+#include <util/macros.hpp>
+#include <util/util_types.hpp>
+#include <ast/ast_node.hpp>
+#include <ast/ast_types.hpp>
 
 class AST_Imports;
 
diff --git a/src/mmoc/deps/builders/eq_graph_builder.cpp b/src/mmoc/deps/builders/eq_graph_builder.cpp
index b3845982..b17fdfb0 100644
--- a/src/mmoc/deps/builders/eq_graph_builder.cpp
+++ b/src/mmoc/deps/builders/eq_graph_builder.cpp
@@ -17,11 +17,11 @@
 
  ******************************************************************************/
 
-#include "eq_graph_builder.h"
+#include "eq_graph_builder.hpp"
 
-#include <util/model_config.h>
-#include <util/logger.h>
-#include <util/util_types.h>
+#include <util/model_config.hpp>
+#include <util/logger.hpp>
+#include <util/util_types.hpp>
 
 using namespace SB;
 
diff --git a/src/mmoc/deps/builders/eq_graph_builder.hpp b/src/mmoc/deps/builders/eq_graph_builder.hpp
index a891b053..fa2fe84d 100644
--- a/src/mmoc/deps/builders/eq_graph_builder.hpp
+++ b/src/mmoc/deps/builders/eq_graph_builder.hpp
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <util/symbol_table.h>
-#include <deps/sbg_graph/build_from_exps.h>
-#include <deps/sbg_graph/deps_graph.h>
+#include <util/symbol_table.hpp>
+#include <deps/sbg_graph/build_from_exps.hpp>
+#include <deps/sbg_graph/deps_graph.hpp>
 
 namespace MicroModelica {
 namespace Deps {
diff --git a/src/mmoc/deps/builders/ev_graph_builder.cpp b/src/mmoc/deps/builders/ev_graph_builder.cpp
index 71d8879b..cd8324c6 100644
--- a/src/mmoc/deps/builders/ev_graph_builder.cpp
+++ b/src/mmoc/deps/builders/ev_graph_builder.cpp
@@ -20,11 +20,11 @@
 #include <boost/algorithm/string.hpp>
 #include <string>
 
-#include "ev_graph_builder.h"
+#include "ev_graph_builder.hpp"
 
-#include <util/model_config.h>
-#include <util/logger.h>
-#include <util/util_types.h>
+#include <util/model_config.hpp>
+#include <util/logger.hpp>
+#include <util/util_types.hpp>
 
 using namespace SB;
 
diff --git a/src/mmoc/deps/builders/ev_graph_builder.hpp b/src/mmoc/deps/builders/ev_graph_builder.hpp
index a93f6e7a..c2c45ee2 100644
--- a/src/mmoc/deps/builders/ev_graph_builder.hpp
+++ b/src/mmoc/deps/builders/ev_graph_builder.hpp
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <deps/sbg_graph/build_from_exps.h>
-#include <deps/sbg_graph/deps_graph.h>
+#include <deps/sbg_graph/build_from_exps.hpp>
+#include <deps/sbg_graph/deps_graph.hpp>
 
 namespace MicroModelica {
 namespace Deps {
diff --git a/src/mmoc/deps/builders/index_shift_builder.cpp b/src/mmoc/deps/builders/index_shift_builder.cpp
index c6f3e671..3c22fecf 100644
--- a/src/mmoc/deps/builders/index_shift_builder.cpp
+++ b/src/mmoc/deps/builders/index_shift_builder.cpp
@@ -17,12 +17,12 @@
 
  ******************************************************************************/
 
-#include "index_shift_builder.h"
+#include "index_shift_builder.hpp"
 
-#include <deps/sbg_graph/graph.h>
-#include <util/util_types.h>
-#include <util/visitors/apply_var_usage.h>
-#include <util/visitors/eval_init_exp.h>
+#include <deps/sbg_graph/graph.hpp>
+#include <util/util_types.hpp>
+#include <util/visitors/apply_var_usage.hpp>
+#include <util/visitors/eval_init_exp.hpp>
 
 using namespace SB;
 
diff --git a/src/mmoc/deps/builders/index_shift_builder.hpp b/src/mmoc/deps/builders/index_shift_builder.hpp
index 02684eb5..f98ba2c4 100644
--- a/src/mmoc/deps/builders/index_shift_builder.hpp
+++ b/src/mmoc/deps/builders/index_shift_builder.hpp
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include "../../ir/equation.h"
-#include "../../util/symbol_table.h"
-#include <deps/sbg_graph/deps_graph.h>
+#include "../../ir/equation.hpp"
+#include "../../util/symbol_table.hpp"
+#include <deps/sbg_graph/deps_graph.hpp>
 
 namespace MicroModelica {
 namespace Deps {
diff --git a/src/mmoc/deps/builders/merge_graph.cpp b/src/mmoc/deps/builders/merge_graph.cpp
index 6e8533c7..c50a1c61 100644
--- a/src/mmoc/deps/builders/merge_graph.cpp
+++ b/src/mmoc/deps/builders/merge_graph.cpp
@@ -17,11 +17,11 @@
 
  ******************************************************************************/
 
-#include <deps/builders/index_shift_builder.h>
-#include <deps/builders/merge_graph_builder.h>
-#include <deps/sbg_graph/build_from_exps.h>
-#include <deps/sbg_graph/graph.h>
-#include <util/model_config.h>
+#include <deps/builders/index_shift_builder.hpp>
+#include <deps/builders/merge_graph_builder.hpp>
+#include <deps/sbg_graph/build_from_exps.hpp>
+#include <deps/sbg_graph/graph.hpp>
+#include <util/model_config.hpp>
 
 namespace MicroModelica {
 using namespace IR;
@@ -92,7 +92,7 @@ SB::Deps::Graph MergeGraph<GraphBuilder, S, C, Builder>::build()
 
   SB::Deps::GraphPrinter printer(merge_graph);
 
-  printer.printGraph(Logger::instance().getLogsPath()+S::name()+".dot");
+  printer.printGraph(Logger::instance().getLogsPath() + S::name() + ".dot");
 
   return merge_graph;
 }
diff --git a/src/mmoc/deps/builders/merge_graph.hpp b/src/mmoc/deps/builders/merge_graph.hpp
index 59b0d4a9..5e534652 100644
--- a/src/mmoc/deps/builders/merge_graph.hpp
+++ b/src/mmoc/deps/builders/merge_graph.hpp
@@ -20,13 +20,13 @@
 #pragma once
 
 
-#include <deps/builders/eq_graph_builder.h>
-#include <deps/builders/ev_graph_builder.h>
-#include <deps/sb_dependencies.h>
-#include <deps/sbg_graph/deps_graph.h>
-#include <ir/equation.h>
-#include <ir/event.h>
-#include <ir/node_selector.h>
+#include <deps/builders/eq_graph_builder.hpp>
+#include <deps/builders/ev_graph_builder.hpp>
+#include <deps/sb_dependencies.hpp>
+#include <deps/sbg_graph/deps_graph.hpp>
+#include <ir/equation.hpp>
+#include <ir/event.hpp>
+#include <ir/node_selector.hpp>
 
 namespace MicroModelica {
 namespace Deps {
diff --git a/src/mmoc/deps/builders/merge_graph_builder.cpp b/src/mmoc/deps/builders/merge_graph_builder.cpp
index f2c0dff8..a54b9987 100644
--- a/src/mmoc/deps/builders/merge_graph_builder.cpp
+++ b/src/mmoc/deps/builders/merge_graph_builder.cpp
@@ -17,12 +17,12 @@
 
  ******************************************************************************/
 
-#include <deps/builders/index_shift_builder.h>
-#include <deps/builders/merge_graph_builder.h>
-#include <deps/sbg_graph/build_from_exps.h>
-#include <deps/sbg_graph/graph.h>
-#include <util/model_config.h>
-#include <util/visitors/pwl_map_values.h>
+#include <deps/builders/index_shift_builder.hpp>
+#include <deps/builders/merge_graph_builder.hpp>
+#include <deps/sbg_graph/build_from_exps.hpp>
+#include <deps/sbg_graph/graph.hpp>
+#include <util/model_config.hpp>
+#include <util/visitors/pwl_map_values.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/deps/builders/merge_graph_builder.hpp b/src/mmoc/deps/builders/merge_graph_builder.hpp
index 5d0793fa..e4dc24ef 100644
--- a/src/mmoc/deps/builders/merge_graph_builder.hpp
+++ b/src/mmoc/deps/builders/merge_graph_builder.hpp
@@ -21,13 +21,13 @@
 
 #include <map>
 
-#include <deps/builders/eq_graph_builder.h>
-#include <deps/builders/ev_graph_builder.h>
-#include <deps/sbg_graph/deps_graph.h>
-#include <ir/equation.h>
-#include <ir/event.h>
-#include <ir/node_selector.h>
-#include <ir/statement.h>
+#include <deps/builders/eq_graph_builder.hpp>
+#include <deps/builders/ev_graph_builder.hpp>
+#include <deps/sbg_graph/deps_graph.hpp>
+#include <ir/equation.hpp>
+#include <ir/event.hpp>
+#include <ir/node_selector.hpp>
+#include <ir/statement.hpp>
 
 namespace MicroModelica {
 namespace Deps {
diff --git a/src/mmoc/deps/jacobian_matrices.cpp b/src/mmoc/deps/jacobian_matrices.cpp
index e72b2550..e27c47c7 100644
--- a/src/mmoc/deps/jacobian_matrices.cpp
+++ b/src/mmoc/deps/jacobian_matrices.cpp
@@ -17,16 +17,16 @@
 
  ******************************************************************************/
 
-#include "jacobian_matrices.h"
-
-#include <deps/builders/eq_graph_builder.h>
-#include <deps/sbg_graph/build_from_exps.h>
-#include <deps/sb_dependencies.h>
-#include <ir/alg_usage.h>
-#include <ir/helpers.h>
-#include <util/model_config.h>
-#include <util/util.h>
-#include <util/visitors/replace_index.h>
+#include "jacobian_matrices.hpp"
+
+#include <deps/builders/eq_graph_builder.hpp>
+#include <deps/sbg_graph/build_from_exps.hpp>
+#include <deps/sb_dependencies.hpp>
+#include <ir/alg_usage.hpp>
+#include <ir/helpers.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/visitors/replace_index.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/deps/jacobian_matrices.hpp b/src/mmoc/deps/jacobian_matrices.hpp
index 94104200..b3e2ba16 100644
--- a/src/mmoc/deps/jacobian_matrices.hpp
+++ b/src/mmoc/deps/jacobian_matrices.hpp
@@ -21,9 +21,9 @@
 
 #include <map>
 
-#include <deps/sbg_graph/deps_graph.h>
-#include <ir/equation.h>
-#include <ir/equation.h>
+#include <deps/sbg_graph/deps_graph.hpp>
+#include <ir/equation.hpp>
+#include <ir/equation.hpp>
 
 namespace MicroModelica {
 namespace Deps {
diff --git a/src/mmoc/deps/model_dependencies.cpp b/src/mmoc/deps/model_dependencies.cpp
index 997aeb94..cb770e31 100644
--- a/src/mmoc/deps/model_dependencies.cpp
+++ b/src/mmoc/deps/model_dependencies.cpp
@@ -17,13 +17,12 @@
 
  ******************************************************************************/
 
-#include "model_dependencies.h"
+#include "model_dependencies.hpp"
 
-#include <ir/annotation.h>
-#include <util/model_config.h>
-#include <util/util.h>
-
-#include <deps/builders/index_shift_builder.h>
+#include <deps/builders/index_shift_builder.hpp>
+#include <ir/annotation.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/deps/model_dependencies.hpp b/src/mmoc/deps/model_dependencies.hpp
index daf3fd45..601018b7 100644
--- a/src/mmoc/deps/model_dependencies.hpp
+++ b/src/mmoc/deps/model_dependencies.hpp
@@ -19,11 +19,11 @@
 
 #pragma once
 
-#include <ir/equation.h>
-#include <ir/event.h>
-#include <ir/model_matrix.h>
-#include <util/symbol_table.h>
-#include <deps/sb_dependencies.h>
+#include <ir/equation.hpp>
+#include <ir/event.hpp>
+#include <ir/model_matrix.hpp>
+#include <util/symbol_table.hpp>
+#include <deps/sb_dependencies.hpp>
 
 namespace MicroModelica {
 namespace Deps {
diff --git a/src/mmoc/deps/sb_dependencies.cpp b/src/mmoc/deps/sb_dependencies.cpp
index a3b5a78f..f131a865 100644
--- a/src/mmoc/deps/sb_dependencies.cpp
+++ b/src/mmoc/deps/sb_dependencies.cpp
@@ -17,19 +17,19 @@
 
  ******************************************************************************/
 
-#include "sb_dependencies.h"
+#include "sb_dependencies.hpp"
 
 #include <cassert>
 #include <cstdlib>
 #include <stdio.h>
 #include <iostream>
 
-#include <deps/sbg_graph/build_from_exps.h>
-#include <ir/helpers.h>
-#include <ir/index.h>
-#include <ast/parser/parse.h>
-#include <util/logger.h>
-#include <util/util.h>
+#include <deps/sbg_graph/build_from_exps.hpp>
+#include <ir/helpers.hpp>
+#include <ir/index.hpp>
+#include <ast/parser/parse.hpp>
+#include <util/logger.hpp>
+#include <util/util.hpp>
 
 using namespace std;
 using namespace SB;
@@ -261,7 +261,7 @@ void SBDependencies<IDependencies, R, S>::paths(SB::Deps::Graph& graph, SB::Deps
     }
   }
   SB::Deps::updateNumDeps(graph, V, num_gen);
-  // If the algebraic equation has no influencee but have recursive uses
+  // If the algebraic equation.hppas no influencee but have recursive uses
   // we should add the only algebraic uses too.
   if (no_influencee && !rec_alg_use_maps.empty()) {
     recursiveDeps(graph, SB::PWLMap(), V, V, num_gen, rec_alg_use_maps);
diff --git a/src/mmoc/deps/sb_dependencies.hpp b/src/mmoc/deps/sb_dependencies.hpp
index a4b6d87e..5d6501c5 100644
--- a/src/mmoc/deps/sb_dependencies.hpp
+++ b/src/mmoc/deps/sb_dependencies.hpp
@@ -21,17 +21,17 @@
 
 #include <string>
 
-#include <ir/equation.h>
-#include <ir/event.h>
-#include <ir/jacobian.h>
-#include <ir/model_matrix_gen.h>
-#include <ir/qss_model.h>
-#include <ir/qss_model_deps.h>
-#include <util/symbol_table.h>
-#include <deps/builders/index_shift_builder.h>
-#include <deps/builders/merge_graph_builder.h>
-#include <deps/sbg_graph/deps_graph.h>
-#include <deps/jacobian_matrices.h>
+#include <ir/equation.hpp>
+#include <ir/event.hpp>
+#include <ir/jacobian.hpp>
+#include <ir/model_matrix_gen.hpp>
+#include <ir/qss_model.hpp>
+#include <ir/qss_model_deps.hpp>
+#include <util/symbol_table.hpp>
+#include <deps/builders/index_shift_builder.hpp>
+#include <deps/builders/merge_graph_builder.hpp>
+#include <deps/sbg_graph/deps_graph.hpp>
+#include <deps/jacobian_matrices.hpp>
 
 namespace MicroModelica {
 namespace Deps {
diff --git a/src/mmoc/deps/sbg_graph/atomic_set.hpp b/src/mmoc/deps/sbg_graph/atomic_set.hpp
index 0374c095..541bd41c 100644
--- a/src/mmoc/deps/sbg_graph/atomic_set.hpp
+++ b/src/mmoc/deps/sbg_graph/atomic_set.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <deps/sbg_graph/container_def.h>
-#include <deps/sbg_graph/interval.h>
-#include <deps/sbg_graph/multi_interval.h>
+#include <deps/sbg_graph/container_def.hpp>
+#include <deps/sbg_graph/interval.hpp>
+#include <deps/sbg_graph/multi_interval.hpp>
 
 namespace SB {
 
diff --git a/src/mmoc/deps/sbg_graph/build_from_exps.cpp b/src/mmoc/deps/sbg_graph/build_from_exps.cpp
index 6d950f79..347038a2 100644
--- a/src/mmoc/deps/sbg_graph/build_from_exps.cpp
+++ b/src/mmoc/deps/sbg_graph/build_from_exps.cpp
@@ -17,14 +17,14 @@
 
  ******************************************************************************/
 
-#include "build_from_exps.h"
-
-#include <deps/sbg_graph/interval.h>
-#include <util/logger.h>
-#include <util/model_config.h>
-#include <util/visitors/is_constant_index.h>
-#include <util/visitors/occurs.h>
-#include <util/visitors/pwl_map_values.h>
+#include "build_from_exps.hpp"
+
+#include <deps/sbg_graph/interval.hpp>
+#include <util/logger.hpp>
+#include <util/model_config.hpp>
+#include <util/visitors/is_constant_index.hpp>
+#include <util/visitors/occurs.hpp>
+#include <util/visitors/pwl_map_values.hpp>
 
 namespace SB {
 
diff --git a/src/mmoc/deps/sbg_graph/build_from_exps.hpp b/src/mmoc/deps/sbg_graph/build_from_exps.hpp
index 987d8734..de1c3881 100644
--- a/src/mmoc/deps/sbg_graph/build_from_exps.hpp
+++ b/src/mmoc/deps/sbg_graph/build_from_exps.hpp
@@ -19,14 +19,14 @@
 
 #pragma once
 
-#include <deps/sbg_graph/deps_graph.h>
-#include <deps/sbg_graph/lmap_exp.h>
-#include <deps/sbg_graph/pw_lmap.h>
-#include <deps/sbg_graph/set.h>
-#include <ir/equation.h>
-#include <ir/expression.h>
-#include <ir/event.h>
-#include <util/symbol_table.h>
+#include <deps/sbg_graph/deps_graph.hpp>
+#include <deps/sbg_graph/lmap_exp.hpp>
+#include <deps/sbg_graph/pw_lmap.hpp>
+#include <deps/sbg_graph/set.hpp>
+#include <ir/equation.hpp>
+#include <ir/expression.hpp>
+#include <ir/event.hpp>
+#include <util/symbol_table.hpp>
 
 namespace SB {
 
diff --git a/src/mmoc/deps/sbg_graph/deps_graph.hpp b/src/mmoc/deps/sbg_graph/deps_graph.hpp
index 27fc319e..44f38453 100644
--- a/src/mmoc/deps/sbg_graph/deps_graph.hpp
+++ b/src/mmoc/deps/sbg_graph/deps_graph.hpp
@@ -23,12 +23,12 @@
 #include <iterator>
 #include <boost/graph/adjacency_list.hpp>
 
-#include <deps/sbg_graph/graph.h>
-#include <deps/sbg_graph/graph_printer.h>
-#include <deps/sbg_graph/lmap_exp.h>
-#include <deps/sbg_graph/pw_lmap.h>
-#include <ir/expression.h>
-#include <util/symbol_table.h>
+#include <deps/sbg_graph/graph.hpp>
+#include <deps/sbg_graph/graph_printer.hpp>
+#include <deps/sbg_graph/lmap_exp.hpp>
+#include <deps/sbg_graph/pw_lmap.hpp>
+#include <ir/expression.hpp>
+#include <util/symbol_table.hpp>
 
 namespace SB {
 namespace Deps {
diff --git a/src/mmoc/deps/sbg_graph/graph.hpp b/src/mmoc/deps/sbg_graph/graph.hpp
index d267a00c..5afcf063 100644
--- a/src/mmoc/deps/sbg_graph/graph.hpp
+++ b/src/mmoc/deps/sbg_graph/graph.hpp
@@ -22,8 +22,8 @@
 #include <boost/graph/adjacency_list.hpp>
 #include <variant>
 
-#include <deps/sbg_graph/set.h>
-#include <deps/sbg_graph/pw_lmap.h>
+#include <deps/sbg_graph/set.hpp>
+#include <deps/sbg_graph/pw_lmap.hpp>
 
 namespace SB {
 
diff --git a/src/mmoc/deps/sbg_graph/graph_definition.cpp b/src/mmoc/deps/sbg_graph/graph_definition.cpp
index 378bae33..0126551f 100644
--- a/src/mmoc/deps/sbg_graph/graph_definition.cpp
+++ b/src/mmoc/deps/sbg_graph/graph_definition.cpp
@@ -28,9 +28,9 @@
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/unordered_set.hpp>
 
-#include <util/debug.h>
+#include <util/debug.hpp>
 #include <util/graph/graph_definition.h>
-#include <util/table.h>
+#include <util/table.hpp>
 
 namespace SBG {
 size_t hash_value(SetVertex v) { return v.hash(); }
diff --git a/src/mmoc/deps/sbg_graph/graph_printer.cpp b/src/mmoc/deps/sbg_graph/graph_printer.cpp
index 0ea98257..21343718 100644
--- a/src/mmoc/deps/sbg_graph/graph_printer.cpp
+++ b/src/mmoc/deps/sbg_graph/graph_printer.cpp
@@ -17,8 +17,8 @@
 
  ******************************************************************************/
 
-#include <deps/sbg_graph/graph_printer.h>
-#include <deps/sbg_graph/deps_graph.h>
+#include <deps/sbg_graph/graph_printer.hpp>
+#include <deps/sbg_graph/deps_graph.hpp>
 
 #include <list>
 #include <iostream>
diff --git a/src/mmoc/deps/sbg_graph/interval.cpp b/src/mmoc/deps/sbg_graph/interval.cpp
index 52375129..05115dc7 100644
--- a/src/mmoc/deps/sbg_graph/interval.cpp
+++ b/src/mmoc/deps/sbg_graph/interval.cpp
@@ -16,7 +16,7 @@
  along with QSS Solver.  If not, see <http://www.gnu.org/licenses/>.
 
  ******************************************************************************/
-#include <deps/sbg_graph/interval.h>
+#include <deps/sbg_graph/interval.hpp>
 
 std::string mapOper(Real cte) { return (cte >= 0) ? "+ " : ""; }
 
@@ -49,5 +49,3 @@ ostream &operator<<(ostream &out, LMap &lm)
 
   return out;
 }
-
-
diff --git a/src/mmoc/deps/sbg_graph/interval.hpp b/src/mmoc/deps/sbg_graph/interval.hpp
index e9c6c406..f7ca3041 100644
--- a/src/mmoc/deps/sbg_graph/interval.hpp
+++ b/src/mmoc/deps/sbg_graph/interval.hpp
@@ -23,8 +23,8 @@
 #include <map>
 #include <math.h>
 
-#include <deps/sbg_graph/container_def.h>
-#include <util/logger.h>
+#include <deps/sbg_graph/container_def.hpp>
+#include <util/logger.hpp>
 
 namespace SB {
 
diff --git a/src/mmoc/deps/sbg_graph/lmap_exp.cpp b/src/mmoc/deps/sbg_graph/lmap_exp.cpp
index 0a49662d..d529e83d 100644
--- a/src/mmoc/deps/sbg_graph/lmap_exp.cpp
+++ b/src/mmoc/deps/sbg_graph/lmap_exp.cpp
@@ -17,7 +17,7 @@
 
  ******************************************************************************/
 
-#include "lmap_exp.h"
+#include "lmap_exp.hpp"
 
 #include <assert.h>
 #include <boost/algorithm/string/join.hpp>
diff --git a/src/mmoc/deps/sbg_graph/map_operations.cpp b/src/mmoc/deps/sbg_graph/map_operations.cpp
index b87c2edd..ddd46699 100644
--- a/src/mmoc/deps/sbg_graph/map_operations.cpp
+++ b/src/mmoc/deps/sbg_graph/map_operations.cpp
@@ -17,15 +17,18 @@
 
  ******************************************************************************/
 
-#include <deps/sbg_graph/container_def.h>
-#include <deps/sbg_graph/graph.h>
-#include <deps/sbg_graph/interval.h>
-#include <deps/sbg_graph/map_operations.h>
+#include <deps/sbg_graph/container_def.hpp>
+#include <deps/sbg_graph/graph.hpp>
+#include <deps/sbg_graph/interval.hpp>
+#include <deps/sbg_graph/map_operations.hpp>
 
 namespace SB {
 
 template <typename T>
-size_t hash_value(SetVertex<T> v) { return v.hash(); }
+size_t hash_value(SetVertex<T> v)
+{
+  return v.hash();
+}
 
 // This operations are implemented here to simplificate the implementation.
 
@@ -64,7 +67,7 @@ PWLMap minAtomPW(AtomSet &dom, LMap &lm1, LMap &lm2)
 
           domRes.insert(domRes.begin(), sAux);
           lmRes.insert(lmRes.begin(), lmAux);
-        } else if (xinter >= (*itints).hi()) { // Intersection after domain
+        } else if (xinter >= (*itints).hi()) {  // Intersection after domain
           if (*itg2 > g1i) lmAux = lm2;
 
           Set sAux;
@@ -72,7 +75,7 @@ PWLMap minAtomPW(AtomSet &dom, LMap &lm1, LMap &lm2)
 
           domRes.insert(domRes.begin(), sAux);
           lmRes.insert(lmRes.begin(), lmAux);
-        } else { // Intersection in domain
+        } else {  // Intersection in domain
           Interval i1((*itints).lo(), (*itints).step(), floor(xinter));
           Interval i2(i1.hi() + i1.step(), (*itints).step(), (*itints).hi());
 
@@ -704,7 +707,7 @@ PWLMap minAdjMap(PWLMap pw2, PWLMap pw1)
   return res;
 }
 
-template<typename E>
+template <typename E>
 SetEdge<E> restrictEdge(SetEdge<E> e, Set dom)
 {
   PWLMap es1 = e.mapF();
@@ -717,4 +720,4 @@ SetEdge<E> restrictEdge(SetEdge<E> e, Set dom)
   return res;
 }
 
-} // namespace SB
+}  // namespace SB
diff --git a/src/mmoc/deps/sbg_graph/map_operations.hpp b/src/mmoc/deps/sbg_graph/map_operations.hpp
index 0b81f260..ee03d5a4 100644
--- a/src/mmoc/deps/sbg_graph/map_operations.hpp
+++ b/src/mmoc/deps/sbg_graph/map_operations.hpp
@@ -1,9 +1,9 @@
 
 #pragma once
 
-#include <deps/sbg_graph/set.h>
-#include <deps/sbg_graph/linear_map.h>
-#include <deps/sbg_graph/pw_lmap.h>
+#include <deps/sbg_graph/set.hpp>
+#include <deps/sbg_graph/linear_map.hpp>
+#include <deps/sbg_graph/pw_lmap.hpp>
 
 namespace SB {
 
diff --git a/src/mmoc/deps/sbg_graph/multi_interval.hpp b/src/mmoc/deps/sbg_graph/multi_interval.hpp
index 13b6268b..9ff1f375 100644
--- a/src/mmoc/deps/sbg_graph/multi_interval.hpp
+++ b/src/mmoc/deps/sbg_graph/multi_interval.hpp
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <deps/sbg_graph/container_def.h>
-#include <deps/sbg_graph/interval.h>
+#include <deps/sbg_graph/container_def.hpp>
+#include <deps/sbg_graph/interval.hpp>
 
 namespace SB {
 
diff --git a/src/mmoc/deps/sbg_graph/printers.cpp b/src/mmoc/deps/sbg_graph/printers.cpp
index ae557cfa..006fbedc 100644
--- a/src/mmoc/deps/sbg_graph/printers.cpp
+++ b/src/mmoc/deps/sbg_graph/printers.cpp
@@ -17,13 +17,13 @@
 
  ******************************************************************************/
 
-#include <deps/sbg_graph/atomic_set.h>
-#include <deps/sbg_graph/interval.h>
-#include <deps/sbg_graph/multi_interval.h>
-#include <deps/sbg_graph/linear_map.h>
-#include <deps/sbg_graph/pw_atom_map.h>
-#include <deps/sbg_graph/pw_lmap.h>
-#include <deps/sbg_graph/set.h>
+#include <deps/sbg_graph/atomic_set.hpp>
+#include <deps/sbg_graph/interval.hpp>
+#include <deps/sbg_graph/multi_interval.hpp>
+#include <deps/sbg_graph/linear_map.hpp>
+#include <deps/sbg_graph/pw_atom_map.hpp>
+#include <deps/sbg_graph/pw_lmap.hpp>
+#include <deps/sbg_graph/set.hpp>
 
 namespace SB {
 
@@ -167,4 +167,4 @@ ostream &operator<<(ostream &out, PWLMap &pw)
 
   return out;
 }
-} // namespace SB
\ No newline at end of file
+}  // namespace SB
\ No newline at end of file
diff --git a/src/mmoc/deps/sbg_graph/pw_atom_map.hpp b/src/mmoc/deps/sbg_graph/pw_atom_map.hpp
index e33347fb..5f472e17 100644
--- a/src/mmoc/deps/sbg_graph/pw_atom_map.hpp
+++ b/src/mmoc/deps/sbg_graph/pw_atom_map.hpp
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <deps/sbg_graph/atomic_set.h>
-#include <deps/sbg_graph/container_def.h>
-#include <deps/sbg_graph/linear_map.h>
+#include <deps/sbg_graph/atomic_set.hpp>
+#include <deps/sbg_graph/container_def.hpp>
+#include <deps/sbg_graph/linear_map.hpp>
 
 namespace SB {
 
diff --git a/src/mmoc/deps/sbg_graph/pw_lmap.hpp b/src/mmoc/deps/sbg_graph/pw_lmap.hpp
index af2a12b2..ea9ad7c3 100644
--- a/src/mmoc/deps/sbg_graph/pw_lmap.hpp
+++ b/src/mmoc/deps/sbg_graph/pw_lmap.hpp
@@ -19,10 +19,10 @@
 
 #pragma once
 
-#include <deps/sbg_graph/atomic_set.h>
-#include <deps/sbg_graph/container_def.h>
-#include <deps/sbg_graph/pw_atom_map.h>
-#include <deps/sbg_graph/set.h>
+#include <deps/sbg_graph/atomic_set.hpp>
+#include <deps/sbg_graph/container_def.hpp>
+#include <deps/sbg_graph/pw_atom_map.hpp>
+#include <deps/sbg_graph/set.hpp>
 
 namespace SB {
 
diff --git a/src/mmoc/deps/sbg_graph/set.hpp b/src/mmoc/deps/sbg_graph/set.hpp
index f10fa305..d394d62c 100644
--- a/src/mmoc/deps/sbg_graph/set.hpp
+++ b/src/mmoc/deps/sbg_graph/set.hpp
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <deps/sbg_graph/atomic_set.h>
-#include <deps/sbg_graph/container_def.h>
+#include <deps/sbg_graph/atomic_set.hpp>
+#include <deps/sbg_graph/container_def.hpp>
 
 namespace SB {
 
diff --git a/src/mmoc/generator/files.cpp b/src/mmoc/generator/files.cpp
index 044983df..13749af3 100644
--- a/src/mmoc/generator/files.cpp
+++ b/src/mmoc/generator/files.cpp
@@ -17,8 +17,6 @@
 
  ******************************************************************************/
 
-#include "files.h"
-
 #include <cstdio>
 #include <cstdlib>
 #include <iostream>
@@ -27,21 +25,20 @@
 #include <map>
 #include <set>
 #include <sstream>
+#include <sys/stat.h>
 #include <utility>
 
-#include <generator/writer.h>
-#include <ir/annotation.h>
-#include <ir/class.h>
-#include <ir/equation.h>
-#include <ir/expression.h>
-#include <util/compile_flags.h>
-#include <util/symbol_table.h>
-#include <util/util.h>
-#include <util/visitors/partition_interval.h>
+#include "files.hpp"
 
-#ifdef __linux__
-#include <sys/stat.h>
-#endif
+#include <generator/writer.hpp>
+#include <ir/annotation.hpp>
+#include <ir/class.hpp>
+#include <ir/equation.hpp>
+#include <ir/expression.hpp>
+#include <util/compile_flags.hpp>
+#include <util/symbol_table.hpp>
+#include <util/util.hpp>
+#include <util/visitors/partition_interval.hpp>
 
 using namespace std;
 
diff --git a/src/mmoc/generator/files.hpp b/src/mmoc/generator/files.hpp
index 57bce4f5..0ebf6758 100644
--- a/src/mmoc/generator/files.hpp
+++ b/src/mmoc/generator/files.hpp
@@ -20,13 +20,13 @@
 #pragma once
 
 #include <fstream>
-#include <string>
 #include <list>
+#include <string>
 
-#include <generator/model_instance.h>
-#include <ir/annotation.h>
-#include <ir/class.h>
-#include <util/compile_flags.h>
+#include <generator/model_instance.hpp>
+#include <ir/annotation.hpp>
+#include <ir/class.hpp>
+#include <util/compile_flags.hpp>
 
 namespace MicroModelica {
 namespace Generator {
diff --git a/src/mmoc/generator/function.cpp b/src/mmoc/generator/function.cpp
index 8e0848a6..fb0dc71a 100644
--- a/src/mmoc/generator/function.cpp
+++ b/src/mmoc/generator/function.cpp
@@ -19,18 +19,18 @@
 
 #include <sstream>
 
-#include <generator/function.h>
-#include <util/model_config.h>
+#include <generator/function.hpp>
+#include <util/model_config.hpp>
 
 namespace MicroModelica {
 using namespace IR;
 using namespace Util;
 namespace Generator {
-  
+
 Function::Function(IR::Function& function, CompileFlags& flags, WriterPtr writer)
     : _function(function), _flags(flags), _writer(writer), _prefix("__"), _include(), _return_variable(), _symbols(), _void_function(false)
 {
-  _symbols = ModelConfig::instance().symbols(); 
+  _symbols = ModelConfig::instance().symbols();
   ModelConfig::instance().setSymbols(_function.symbols());
   ModelConfig::instance().setFunctionOutputs(_function.outputNbr() > 1);
   ModelConfig::instance().setFunctionCode(true);
@@ -41,7 +41,6 @@ Function::~Function()
   ModelConfig::instance().setSymbols(_symbols);
   ModelConfig::instance().setFunctionOutputs(false);
   ModelConfig::instance().setFunctionCode(false);
-
 }
 
 void Function::definition()
diff --git a/src/mmoc/generator/function.hpp b/src/mmoc/generator/function.hpp
index 4ac21a48..852bb751 100644
--- a/src/mmoc/generator/function.hpp
+++ b/src/mmoc/generator/function.hpp
@@ -21,10 +21,10 @@
 
 #include <boost/variant/variant.hpp>
 
-#include <ir/class.h>
-#include <generator/writer.h>
-#include <util/compile_flags.h>
-#include <util/util.h>
+#include <generator/writer.hpp>
+#include <ir/class.hpp>
+#include <util/compile_flags.hpp>
+#include <util/util.hpp>
 
 namespace MicroModelica {
 namespace Generator {
diff --git a/src/mmoc/generator/generator.cpp b/src/mmoc/generator/generator.cpp
index 48ef8460..6ea25180 100644
--- a/src/mmoc/generator/generator.cpp
+++ b/src/mmoc/generator/generator.cpp
@@ -19,17 +19,17 @@
 
 #include <sstream>
 
-#include <ir/annotation.h>
-#include <ir/class.h>
-#include <ir/statement.h>
-#include <ir/stored_definition.h>
-#include <util/error.h>
-#include <util/symbol_table.h>
-#include <util/type.h>
-#include <util/util.h>
-#include <generator/function.h>
-#include <generator/generator.h>
-#include <generator/package.h>
+#include <ir/annotation.hpp>
+#include <ir/class.hpp>
+#include <ir/statement.hpp>
+#include <ir/stored_definition.hpp>
+#include <util/error.hpp>
+#include <util/symbol_table.hpp>
+#include <util/type.hpp>
+#include <util/util.hpp>
+#include <generator/function.hpp>
+#include <generator/generator.hpp>
+#include <generator/package.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/generator/generator.hpp b/src/mmoc/generator/generator.hpp
index 249d55d2..fd9ca130 100644
--- a/src/mmoc/generator/generator.hpp
+++ b/src/mmoc/generator/generator.hpp
@@ -25,12 +25,12 @@
 #include <map>
 #include <string>
 
-#include <util/compile_flags.h>
-#include <ir/stored_definition.h>
-#include <ir/class.h>
-#include <generator/model_instance.h>
-#include <generator/files.h>
-#include <generator/writer.h>
+#include <ir/class.hpp>
+#include <ir/stored_definition.hpp>
+#include <generator/model_instance.hpp>
+#include <generator/files.hpp>
+#include <generator/writer.hpp>
+#include <util/compile_flags.hpp>
 
 namespace MicroModelica {
 namespace Generator {
diff --git a/src/mmoc/generator/macros.cpp b/src/mmoc/generator/macros.cpp
index 7a5ff31b..d7d3326e 100644
--- a/src/mmoc/generator/macros.cpp
+++ b/src/mmoc/generator/macros.cpp
@@ -17,11 +17,11 @@
 
  ******************************************************************************/
 
-#include "macros.h"
+#include "macros.hpp"
 
 #include <sstream>
 
-#include <ir/helpers.h>
+#include <ir/helpers.hpp>
 
 using namespace std;
 
diff --git a/src/mmoc/generator/macros.hpp b/src/mmoc/generator/macros.hpp
index 8de31c8d..d2c6e727 100644
--- a/src/mmoc/generator/macros.hpp
+++ b/src/mmoc/generator/macros.hpp
@@ -23,9 +23,9 @@
 #include <string>
 #include <list>
 
-#include <ir/class.h>
-#include <ir/index.h>
-#include <util/symbol_table.h>
+#include <ir/class.hpp>
+#include <ir/index.hpp>
+#include <util/symbol_table.hpp>
 
 namespace MicroModelica {
 namespace Generator {
diff --git a/src/mmoc/generator/model_instance.cpp b/src/mmoc/generator/model_instance.cpp
index c4f63104..85535099 100644
--- a/src/mmoc/generator/model_instance.cpp
+++ b/src/mmoc/generator/model_instance.cpp
@@ -18,26 +18,26 @@
 
  ******************************************************************************/
 
-#include "model_instance.h"
-
 #include <boost/optional/optional_io.hpp>
 #include <utility>
 
-#include <deps/builders/eq_graph_builder.h>
-#include <ast/expression.h>
-#include <generator/macros.h>
-#include <ir/annotation.h>
-#include <ir/class.h>
-#include <ir/equation.h>
-#include <ir/event.h>
-#include <ir/expression.h>
-#include <ir/jacobian.h>
-#include <ir/qss_model.h>
-#include <ir/qss_model_deps.h>
-#include <ir/statement.h>
-#include <util/error.h>
-#include <util/util.h>
-#include <util/visitors/partial_eval_exp.h>
+#include "model_instance.hpp"
+
+#include <ast/expression.hpp>
+#include <deps/builders/eq_graph_builder.hpp>
+#include <generator/macros.hpp>
+#include <ir/annotation.hpp>
+#include <ir/class.hpp>
+#include <ir/equation.hpp>
+#include <ir/event.hpp>
+#include <ir/expression.hpp>
+#include <ir/jacobian.hpp>
+#include <ir/qss_model.hpp>
+#include <ir/qss_model_deps.hpp>
+#include <ir/statement.hpp>
+#include <util/error.hpp>
+#include <util/util.hpp>
+#include <util/visitors/partial_eval_exp.hpp>
 
 namespace MicroModelica {
 
diff --git a/src/mmoc/generator/model_instance.hpp b/src/mmoc/generator/model_instance.hpp
index c2b5b8be..0f0f7f02 100644
--- a/src/mmoc/generator/model_instance.hpp
+++ b/src/mmoc/generator/model_instance.hpp
@@ -22,13 +22,13 @@
 #include <boost/variant/variant.hpp>
 #include <sstream>
 
-#include <generator/writer.h>
-#include <ir/class.h>
-#include <util/compile_flags.h>
-#include <util/graph.h>
-#include <util/model_config.h>
-#include <util/symbol_table.h>
-#include <util/util_types.h>
+#include <generator/writer.hpp>
+#include <ir/class.hpp>
+#include <util/compile_flags.hpp>
+#include <util/graph.hpp>
+#include <util/model_config.hpp>
+#include <util/symbol_table.hpp>
+#include <util/util_types.hpp>
 
 namespace MicroModelica {
 namespace Generator {
diff --git a/src/mmoc/generator/package.cpp b/src/mmoc/generator/package.cpp
index 213929c9..9476e5a2 100644
--- a/src/mmoc/generator/package.cpp
+++ b/src/mmoc/generator/package.cpp
@@ -19,9 +19,9 @@
 
 #include <sstream>
 
-#include <generator/function.h>
-#include <generator/package.h>
-#include <util/util.h>
+#include <generator/function.hpp>
+#include <generator/package.hpp>
+#include <util/util.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/generator/package.hpp b/src/mmoc/generator/package.hpp
index 0b4acad6..0db1b7a1 100644
--- a/src/mmoc/generator/package.hpp
+++ b/src/mmoc/generator/package.hpp
@@ -17,14 +17,13 @@
 
  ******************************************************************************/
 
-#ifndef MMO_GEN_PACKAGE_H_
-#define MMO_GEN_PACKAGE_H_
+#pragma once
 
 #include <boost/variant/variant.hpp>
 
-#include "../ir/class.h"
-#include "../util/compile_flags.h"
-#include "writer.h"
+#include <ir/class.hpp>
+#include <util/compile_flags.hpp>
+#include "writer.hpp"
 
 namespace MicroModelica {
 namespace Generator {
@@ -41,4 +40,3 @@ class Package {
 };
 }  // namespace Generator
 }  // namespace MicroModelica
-#endif /* MMO_GEN_PACKAGE_H */
diff --git a/src/mmoc/generator/writer.cpp b/src/mmoc/generator/writer.cpp
index f6326108..9a840cfb 100644
--- a/src/mmoc/generator/writer.cpp
+++ b/src/mmoc/generator/writer.cpp
@@ -17,11 +17,12 @@
 
  ******************************************************************************/
 
-#include <sstream>
 #include <iostream>
+#include <sstream>
+
+#include "writer.hpp"
 
-#include "writer.h"
-#include "../util/util.h"
+#include <util/util.hpp>
 
 namespace MicroModelica {
 using namespace Util;
diff --git a/src/mmoc/generator/writer.hpp b/src/mmoc/generator/writer.hpp
index 8f2694ac..18893755 100644
--- a/src/mmoc/generator/writer.hpp
+++ b/src/mmoc/generator/writer.hpp
@@ -25,7 +25,7 @@
 #include <list>
 #include <string>
 
-#include "../util/util.h"
+#include "../util/util.hpp"
 
 namespace MicroModelica {
 namespace Generator {
diff --git a/src/mmoc/ir/alg_usage.cpp b/src/mmoc/ir/alg_usage.cpp
index dc24cbaf..1cb292b0 100644
--- a/src/mmoc/ir/alg_usage.cpp
+++ b/src/mmoc/ir/alg_usage.cpp
@@ -17,13 +17,13 @@
 
  ******************************************************************************/
 
-#include "alg_usage.h"
+#include "alg_usage.hpp"
 
-#include "../util/visitors/apply_var_usage.h"
-#include "../util/visitors/partial_eval_exp.h"
-#include "../util/model_config.h"
-#include "../util/util.h"
-#include "expression.h"
+#include "expression.hpp"
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/visitors/apply_var_usage.hpp>
+#include <util/visitors/partial_eval_exp.hpp>
 
 namespace MicroModelica {
 using namespace Util;
diff --git a/src/mmoc/ir/alg_usage.hpp b/src/mmoc/ir/alg_usage.hpp
index fbcb101f..456750de 100644
--- a/src/mmoc/ir/alg_usage.hpp
+++ b/src/mmoc/ir/alg_usage.hpp
@@ -20,8 +20,8 @@
 #ifndef ALG_USAGE_H
 #define ALG_USAGE_H
 
-#include "index.h"
-#include "expression.h"
+#include "index.hpp"
+#include "expression.hpp"
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/annotation.cpp b/src/mmoc/ir/annotation.cpp
index bfcc9346..69db9c71 100644
--- a/src/mmoc/ir/annotation.cpp
+++ b/src/mmoc/ir/annotation.cpp
@@ -20,15 +20,15 @@
 #include <algorithm>
 #include <utility>
 
-#include "annotation.h"
-#include <ast/element.h>
-#include <ast/expression.h>
-#include <ast/modification.h>
-#include "annotation.h"
-#include <util/error.h>
-#include <util/model_config.h>
-#include <util/symbol_table.h>
-#include <util/util.h>
+#include "annotation.hpp"
+
+#include <ast/element.hpp>
+#include <ast/expression.hpp>
+#include <ast/modification.hpp>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/symbol_table.hpp>
+#include <util/util.hpp>
 
 namespace MicroModelica {
 using namespace Util;
diff --git a/src/mmoc/ir/annotation.hpp b/src/mmoc/ir/annotation.hpp
index 550c9642..cde9773d 100644
--- a/src/mmoc/ir/annotation.hpp
+++ b/src/mmoc/ir/annotation.hpp
@@ -24,10 +24,10 @@
 #include <string>
 #include <boost/variant/variant_fwd.hpp>
 
-#include <ast/ast_types.h>
-#include <ir/model_matrix_gen.h>
-#include <util/ast_util.h>
-#include <util/util_types.h>
+#include <ast/ast_types.hpp>
+#include <ir/model_matrix_gen.hpp>
+#include <util/ast_util.hpp>
+#include <util/util_types.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/built_in_functions.cpp b/src/mmoc/ir/built_in_functions.cpp
index ad8d8f43..ad849246 100644
--- a/src/mmoc/ir/built_in_functions.cpp
+++ b/src/mmoc/ir/built_in_functions.cpp
@@ -19,8 +19,9 @@
 
 #include <sstream>
 
-#include "built_in_functions.h"
-#include "../util/error.h"
+#include "built_in_functions.hpp"
+
+#include <util/error.hpp>
 
 namespace MicroModelica {
 using namespace Util;
diff --git a/src/mmoc/ir/built_in_functions.hpp b/src/mmoc/ir/built_in_functions.hpp
index d5399e97..b62ff106 100644
--- a/src/mmoc/ir/built_in_functions.hpp
+++ b/src/mmoc/ir/built_in_functions.hpp
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <ir/helpers.h>
-#include <util/table.h>
+#include <ir/helpers.hpp>
+#include <util/table.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/class.cpp b/src/mmoc/ir/class.cpp
index c69570b5..3d8fd7b0 100644
--- a/src/mmoc/ir/class.cpp
+++ b/src/mmoc/ir/class.cpp
@@ -17,31 +17,31 @@
 
  ******************************************************************************/
 
-#include "class.h"
+#include "class.hpp"
 
 #include <iterator>
 #include <sstream>
 #include <utility>
 
-#include <ast/ast_builder.h>
-#include <ast/composition.h>
-#include <ast/equation.h>
-#include <ast/expression.h>
-#include <ast/modification.h>
-#include <ast/statement.h>
-#include <ir/helpers.h>
-#include <util/error.h>
-#include <util/model_config.h>
-#include <util/process_statement.h>
-#include <util/util.h>
-#include <util/visitors/convert_condition.h>
-#include <util/visitors/convert_cont_red.h>
-#include <util/visitors/convert_equation.h>
-#include <util/visitors/convert_output_range.h>
-#include <util/visitors/convert_statement.h>
-#include <util/visitors/eval_init_exp.h>
-#include <util/visitors/partial_eval_exp.h>
-#include <util/visitors/variable_lookup.h>
+#include <ast/ast_builder.hpp>
+#include <ast/composition.hpp>
+#include <ast/equation.hpp>
+#include <ast/expression.hpp>
+#include <ast/modification.hpp>
+#include <ast/statement.hpp>
+#include <ir/helpers.hpp>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/process_statement.hpp>
+#include <util/util.hpp>
+#include <util/visitors/convert_condition.hpp>
+#include <util/visitors/convert_cont_red.hpp>
+#include <util/visitors/convert_equation.hpp>
+#include <util/visitors/convert_output_range.hpp>
+#include <util/visitors/convert_statement.hpp>
+#include <util/visitors/eval_init_exp.hpp>
+#include <util/visitors/partial_eval_exp.hpp>
+#include <util/visitors/variable_lookup.hpp>
 
 namespace MicroModelica {
 using namespace Deps;
diff --git a/src/mmoc/ir/class.hpp b/src/mmoc/ir/class.hpp
index d093b403..4523bce8 100644
--- a/src/mmoc/ir/class.hpp
+++ b/src/mmoc/ir/class.hpp
@@ -25,15 +25,15 @@
 #include <map>
 #include <vector>
 
-#include <ast/ast_types.h>
-#include <deps/model_dependencies.h>
-#include <util/util_types.h>
-#include <ir/annotation.h>
-#include <ir/equation.h>
-#include <ir/event.h>
-#include <ir/helpers.h>
-#include <ir/reduction_functions.h>
-#include <ir/statement.h>
+#include <ast/ast_types.hpp>
+#include <deps/model_dependencies.hpp>
+#include <util/util_types.hpp>
+#include <ir/annotation.hpp>
+#include <ir/equation.hpp>
+#include <ir/event.hpp>
+#include <ir/helpers.hpp>
+#include <ir/reduction_functions.hpp>
+#include <ir/statement.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/compute_deps.cpp b/src/mmoc/ir/compute_deps.cpp
index 66a1519b..58d73930 100644
--- a/src/mmoc/ir/compute_deps.cpp
+++ b/src/mmoc/ir/compute_deps.cpp
@@ -17,10 +17,10 @@
 
  ******************************************************************************/
 
-#include "compute_deps.h"
+#include "compute_deps.hpp"
 
-#include <ir/helpers.h>
-#include <util/model_config.h>
+#include <ir/helpers.hpp>
+#include <util/model_config.hpp>
 
 namespace MicroModelica {
 using namespace Deps;
diff --git a/src/mmoc/ir/compute_deps.hpp b/src/mmoc/ir/compute_deps.hpp
index a3e5a0fa..344b39f4 100644
--- a/src/mmoc/ir/compute_deps.hpp
+++ b/src/mmoc/ir/compute_deps.hpp
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <ir/equation.h>
-#include <deps/sbg_graph/deps_graph.h>
+#include <ir/equation.hpp>
+#include <deps/sbg_graph/deps_graph.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/derivative.cpp b/src/mmoc/ir/derivative.cpp
index 4ab682db..fae8b284 100644
--- a/src/mmoc/ir/derivative.cpp
+++ b/src/mmoc/ir/derivative.cpp
@@ -17,7 +17,7 @@
 
  ******************************************************************************/
 
-#include "derivative.h"
+#include "derivative.hpp"
 
 #include <ginac/function.h>
 #include <ginac/operators.h>
@@ -25,18 +25,18 @@
 #include <ginac/symbol.h>
 #include <ginac/wildcard.h>
 
-#include "../ast/ast_builder.h"
-#include "../ast/equation.h"
-#include "../ir/expression.h"
-#include <ast/parser/parse.h>
-#include "../util/error.h"
-#include "../util/model_config.h"
-#include "../util/ginac_interface.h"
-#include "../util/util.h"
-#include "../util/symbol_table.h"
-#include "../util/visitors/is_constant_expression.h"
-#include "../util/visitors/replace_der.h"
-#include "helpers.h"
+#include <ast/ast_builder.hpp>
+#include <ast/equation.hpp>
+#include <ast/parser/parse.hpp>
+#include "helpers.hpp"
+#include <ir/expression.hpp>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/ginac_interface.hpp>
+#include <util/util.hpp>
+#include <util/symbol_table.hpp>
+#include <util/visitors/is_constant_expression.hpp>
+#include <util/visitors/replace_der.hpp>
 
 namespace MicroModelica {
 using namespace Util;
@@ -48,7 +48,7 @@ ExpressionDerivator::ExpressionDerivator() {}
 AST_Equation_Equality EquationDerivator::derivate(AST_Equation_Equality eq)
 {
   VarSymbolTable symbols = ModelConfig::instance().symbols();
-  ConvertToGiNaC to_ginac= ConvertToGiNaC(Option<Expression>());
+  ConvertToGiNaC to_ginac = ConvertToGiNaC(Option<Expression>());
   ConvertToExpression to_exp;
   GiNaC::ex left = to_ginac.convert(eq->left());
   GiNaC::ex right = to_ginac.convert(eq->right());
@@ -75,7 +75,7 @@ Expression ExpressionDerivator::partialDerivative(Equation eq, Index variable)
   assert(var_usage.isState() || var_usage.isAlgebraic());
   AST_Expression rhs_exp = eq.rhs().expression();
   string usage = variable.modelicaExp();
-  ConvertToGiNaC to_ginac= ConvertToGiNaC(Option<Expression>());
+  ConvertToGiNaC to_ginac = ConvertToGiNaC(Option<Expression>());
   ConvertToExpression to_exp;
   ReplaceDer replace_der;
   GiNaC::ex dexp = to_ginac.convert(rhs_exp, false, true);
diff --git a/src/mmoc/ir/derivative.hpp b/src/mmoc/ir/derivative.hpp
index 1b75aacc..d7b4ac59 100644
--- a/src/mmoc/ir/derivative.hpp
+++ b/src/mmoc/ir/derivative.hpp
@@ -21,12 +21,12 @@
 
 #include <map>
 
-#include "../ast/ast_types.h"
-#include "../util/util_types.h"
-#include "../util/visitors/jac_alg_exps.h"
-#include "index.h"
-#include "equation.h"
-#include "expression.h"
+#include <ast/ast_types.hpp>
+#include "../util/util_types.hpp"
+#include "../util/visitors/jac_alg_exps.hpp"
+#include "index.hpp"
+#include "equation.hpp"
+#include "expression.hpp"
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/equation.cpp b/src/mmoc/ir/equation.cpp
index c78dbd02..bdb52765 100644
--- a/src/mmoc/ir/equation.cpp
+++ b/src/mmoc/ir/equation.cpp
@@ -17,28 +17,28 @@
 
  ******************************************************************************/
 
-#include "equation.h"
+#include "equation.hpp"
 
 #include <boost/optional/optional_io.hpp>
 #include <sstream>
 
-#include <ast/ast_builder.h>
-#include <ast/equation.h>
-#include <ast/expression.h>
-#include <ast/parser/parse.h>
-#include <ir/alg_usage.h>
-#include <ir/derivative.h>
-#include <ir/equation_printer.h>
-#include <ir/helpers.h>
-#include <util/error.h>
-#include <util/model_config.h>
-#include <util/util.h>
-#include <util/visitors/algebraics.h>
-#include <util/visitors/called_functions.h>
-#include <util/visitors/get_index_variables.h>
-#include <util/visitors/is_recursive_def.h>
-#include <util/visitors/replace_der.h>
-#include <util/visitors/revert_index.h>
+#include <ast/ast_builder.hpp>
+#include <ast/equation.hpp>
+#include <ast/expression.hpp>
+#include <ast/parser/parse.hpp>
+#include <ir/alg_usage.hpp>
+#include <ir/derivative.hpp>
+#include <ir/equation_printer.hpp>
+#include <ir/helpers.hpp>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/visitors/algebraics.hpp>
+#include <util/visitors/called_functions.hpp>
+#include <util/visitors/get_index_variables.hpp>
+#include <util/visitors/is_recursive_def.hpp>
+#include <util/visitors/replace_der.hpp>
+#include <util/visitors/revert_index.hpp>
 
 namespace MicroModelica {
 using namespace Util;
diff --git a/src/mmoc/ir/equation.hpp b/src/mmoc/ir/equation.hpp
index a69477c1..c1579422 100644
--- a/src/mmoc/ir/equation.hpp
+++ b/src/mmoc/ir/equation.hpp
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <ast/ast_types.h>
-#include <util/table.h>
-#include <ir/index.h>
+#include <ast/ast_types.hpp>
+#include <util/table.hpp>
+#include <ir/index.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/ir/equation_printer.cpp b/src/mmoc/ir/equation_printer.cpp
index ce3b5f95..fba0aa95 100644
--- a/src/mmoc/ir/equation_printer.cpp
+++ b/src/mmoc/ir/equation_printer.cpp
@@ -17,28 +17,27 @@
 
  ******************************************************************************/
 
-#include "equation_printer.h"
+#include "equation_printer.hpp"
 
 #include <boost/optional/optional_io.hpp>
 #include <sstream>
 
-#include <ast/ast_builder.h>
-#include <ast/equation.h>
-#include <ast/expression.h>
-#include <ast/parser/parse.h>
-#include <ir/annotation.h>
-#include <ir/alg_usage.h>
-#include <ir/derivative.h>
-#include <ir/equation.h>
-#include <ir/helpers.h>
-
-#include <util/error.h>
-#include <util/model_config.h>
-#include <util/util.h>
-#include <util/visitors/get_index_variables.h>
-#include <util/visitors/is_recursive_def.h>
-#include <util/visitors/replace_der.h>
-#include <util/visitors/revert_index.h>
+#include <ast/ast_builder.hpp>
+#include <ast/equation.hpp>
+#include <ast/expression.hpp>
+#include <ast/parser/parse.hpp>
+#include <ir/annotation.hpp>
+#include <ir/alg_usage.hpp>
+#include <ir/derivative.hpp>
+#include <ir/equation.hpp>
+#include <ir/helpers.hpp>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/visitors/get_index_variables.hpp>
+#include <util/visitors/is_recursive_def.hpp>
+#include <util/visitors/replace_der.hpp>
+#include <util/visitors/revert_index.hpp>
 
 namespace MicroModelica {
 using namespace Util;
diff --git a/src/mmoc/ir/equation_printer.hpp b/src/mmoc/ir/equation_printer.hpp
index 55e47c5f..b746fcd2 100644
--- a/src/mmoc/ir/equation_printer.hpp
+++ b/src/mmoc/ir/equation_printer.hpp
@@ -19,10 +19,10 @@
 
 #pragma once
 
-#include <ast/ast_types.h>
-#include <ir/helpers.h>
-#include <ir/index.h>
-#include <util/table.h>
+#include <ast/ast_types.hpp>
+#include <ir/helpers.hpp>
+#include <ir/index.hpp>
+#include <util/table.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/ir/event.cpp b/src/mmoc/ir/event.cpp
index ef460ea4..3c647778 100644
--- a/src/mmoc/ir/event.cpp
+++ b/src/mmoc/ir/event.cpp
@@ -22,11 +22,11 @@
 #include <assert.h>
 #include <sstream>
 
-#include <ast/expression.h>
-#include <ir/helpers.h>
-#include <util/model_config.h>
-#include <util/util.h>
-#include <util/visitors/convert_condition.h>
+#include <ast/expression.hpp>
+#include <ir/helpers.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/visitors/convert_condition.hpp>
 
 namespace MicroModelica {
 using namespace Util;
diff --git a/src/mmoc/ir/event.hpp b/src/mmoc/ir/event.hpp
index 10623201..979c1ed4 100644
--- a/src/mmoc/ir/event.hpp
+++ b/src/mmoc/ir/event.hpp
@@ -19,10 +19,10 @@
 
 #pragma once
 
-#include <ast/ast_types.h>
-#include <util/table.h>
-#include <ir/equation.h>
-#include <ir/statement.h>
+#include <ast/ast_types.hpp>
+#include <util/table.hpp>
+#include <ir/equation.hpp>
+#include <ir/statement.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/expression.cpp b/src/mmoc/ir/expression.cpp
index 6b9c20ac..e19f6bc4 100644
--- a/src/mmoc/ir/expression.cpp
+++ b/src/mmoc/ir/expression.cpp
@@ -17,21 +17,21 @@
 
  ******************************************************************************/
 
-#include "expression.h"
+#include "expression.hpp"
 
 #include <sstream>
 
-#include <ast/expression.h>
-#include <ir/helpers.h>
-#include <ast/parser/parse.h>
-#include <util/error.h>
-#include <util/model_config.h>
-#include <util/util.h>
-#include <util/visitors/autonomous.h>
-#include <util/visitors/expression_printer.h>
-#include <util/visitors/get_index_variables.h>
-#include <util/visitors/is_constant_index.h>
-#include <util/visitors/partial_eval_exp.h>
+#include <ast/expression.hpp>
+#include <ir/helpers.hpp>
+#include <ast/parser/parse.hpp>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/visitors/autonomous.hpp>
+#include <util/visitors/expression_printer.hpp>
+#include <util/visitors/get_index_variables.hpp>
+#include <util/visitors/is_constant_index.hpp>
+#include <util/visitors/partial_eval_exp.hpp>
 
 namespace MicroModelica {
 using namespace Util;
diff --git a/src/mmoc/ir/expression.hpp b/src/mmoc/ir/expression.hpp
index c36b7df4..194104e3 100644
--- a/src/mmoc/ir/expression.hpp
+++ b/src/mmoc/ir/expression.hpp
@@ -21,8 +21,8 @@
 
 #include <string>
 
-#include <ast/ast_types.h>
-#include <util/symbol_table.h>
+#include <ast/ast_types.hpp>
+#include <util/symbol_table.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/helpers.cpp b/src/mmoc/ir/helpers.cpp
index 56b69615..f2d0d774 100644
--- a/src/mmoc/ir/helpers.cpp
+++ b/src/mmoc/ir/helpers.cpp
@@ -19,16 +19,17 @@
 
 #include <sstream>
 
-#include <generator/macros.h>
-#include "helpers.h"
-#include <ir/built_in_functions.h>
-#include <ir/equation.h>
-#include <ir/expression.h>
-#include <util/error.h>
-#include <util/model_config.h>
-#include <util/util.h>
-#include <util/visitors/get_index_variables.h>
-#include <util/visitors/is_constant_expression.h>
+#include "helpers.hpp"
+
+#include <generator/macros.hpp>
+#include <ir/built_in_functions.hpp>
+#include <ir/equation.hpp>
+#include <ir/expression.hpp>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/visitors/get_index_variables.hpp>
+#include <util/visitors/is_constant_expression.hpp>
 
 namespace MicroModelica {
 using namespace Deps;
diff --git a/src/mmoc/ir/helpers.hpp b/src/mmoc/ir/helpers.hpp
index 2d371420..ef79649b 100644
--- a/src/mmoc/ir/helpers.hpp
+++ b/src/mmoc/ir/helpers.hpp
@@ -21,12 +21,12 @@
 
 #include <string>
 
-#include <ir/annotation.h>
-#include <ir/index.h>
-#include <ir/equation.h>
-#include <ir/expression.h>
-#include <util/symbol_table.h>
-#include <util/util.h>
+#include <ir/annotation.hpp>
+#include <ir/index.hpp>
+#include <ir/equation.hpp>
+#include <ir/expression.hpp>
+#include <util/symbol_table.hpp>
+#include <util/util.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/index.cpp b/src/mmoc/ir/index.cpp
index 58589227..1bffc58d 100644
--- a/src/mmoc/ir/index.cpp
+++ b/src/mmoc/ir/index.cpp
@@ -17,25 +17,25 @@
 
  ******************************************************************************/
 
-#include "index.h"
+#include "index.hpp"
 
 #include <sstream>
 
-#include <ir/helpers.h>
-#include <ast/ast_builder.h>
-#include <ast/expression.h>
-#include <ast/equation.h>
-#include <ast/statement.h>
-#include <util/error.h>
-#include <util/model_config.h>
-#include <util/util.h>
-#include <util/visitors/eval_init_exp.h>
-#include <util/visitors/get_index_usage.h>
-#include <util/visitors/is_constant_index.h>
-#include <util/visitors/parse_index.h>
-#include <util/visitors/partial_eval_exp.h>
-#include <util/visitors/replace_index.h>
-#include <util/visitors/revert_index.h>
+#include <ir/helpers.hpp>
+#include <ast/ast_builder.hpp>
+#include <ast/expression.hpp>
+#include <ast/equation.hpp>
+#include <ast/statement.hpp>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/visitors/eval_init_exp.hpp>
+#include <util/visitors/get_index_usage.hpp>
+#include <util/visitors/is_constant_index.hpp>
+#include <util/visitors/parse_index.hpp>
+#include <util/visitors/partial_eval_exp.hpp>
+#include <util/visitors/replace_index.hpp>
+#include <util/visitors/revert_index.hpp>
 
 namespace MicroModelica {
 using namespace Deps;
diff --git a/src/mmoc/ir/index.hpp b/src/mmoc/ir/index.hpp
index 2f2dacb2..323fb3f7 100644
--- a/src/mmoc/ir/index.hpp
+++ b/src/mmoc/ir/index.hpp
@@ -22,10 +22,10 @@
 #include <string>
 #include <map>
 
-#include <ir/expression.h>
-#include <deps/sbg_graph/deps_graph.h>
-#include <util/symbol_table.h>
-#include <util/table.h>
+#include <ir/expression.hpp>
+#include <deps/sbg_graph/deps_graph.hpp>
+#include <util/symbol_table.hpp>
+#include <util/table.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/jacobian.cpp b/src/mmoc/ir/jacobian.cpp
index 9c059c27..5b41d43e 100644
--- a/src/mmoc/ir/jacobian.cpp
+++ b/src/mmoc/ir/jacobian.cpp
@@ -17,20 +17,20 @@
 
  ******************************************************************************/
 
-#include "jacobian.h"
+#include "jacobian.hpp"
 
 #include <sstream>
 
-#include <deps/builders/eq_graph_builder.h>
-#include <deps/sbg_graph/build_from_exps.h>
-#include <deps/sb_dependencies.h>
-#include <ast/parser/parse.h>
-#include <util/model_config.h>
-#include <util/util.h>
-#include <util/symbol_table.h>
-#include <ir/derivative.h>
-#include <ir/helpers.h>
-#include <ir/index.h>
+#include <ast/parser/parse.hpp>
+#include <deps/builders/eq_graph_builder.hpp>
+#include <deps/sbg_graph/build_from_exps.hpp>
+#include <deps/sb_dependencies.hpp>
+#include <ir/derivative.hpp>
+#include <ir/helpers.hpp>
+#include <ir/index.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/symbol_table.hpp>
 
 namespace MicroModelica {
 using namespace Deps;
diff --git a/src/mmoc/ir/jacobian.hpp b/src/mmoc/ir/jacobian.hpp
index f81871c6..41c0c451 100644
--- a/src/mmoc/ir/jacobian.hpp
+++ b/src/mmoc/ir/jacobian.hpp
@@ -22,10 +22,10 @@
 #include <string>
 #include <map>
 
-#include <ir/equation.h>
-#include <deps/sbg_graph/deps_graph.h>
-#include <util/symbol_table.h>
-#include <util/table.h>
+#include <ir/equation.hpp>
+#include <deps/sbg_graph/deps_graph.hpp>
+#include <util/symbol_table.hpp>
+#include <util/table.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/mmo_ir.cpp b/src/mmoc/ir/mmo_ir.cpp
index 32564b2b..b71c4da2 100644
--- a/src/mmoc/ir/mmo_ir.cpp
+++ b/src/mmoc/ir/mmo_ir.cpp
@@ -17,27 +17,27 @@
 
  ******************************************************************************/
 
-#include "mmo_ir.h"
+#include "mmo_ir.hpp"
 
 #include <iterator>
 
-#include <ast/class.h>
-#include <ast/composition.h>
-#include <ast/element.h>
-#include <ast/equation.h>
-#include <ast/expression.h>
-#include <ast/modification.h>
-#include <ast/statement.h>
-#include <ir/class.h>
-#include <ir/expression.h>
-#include <ir/helpers.h>
-#include <ir/stored_definition.h>
-#include <util/visitors/eval_init_exp.h>
-#include <util/visitors/array_use.h>
-#include <util/visitors/discrete_assignment.h>
-#include <util/error.h>
-#include <util/symbol_table.h>
-#include <util/type.h>
+#include <ast/class.hpp>
+#include <ast/composition.hpp>
+#include <ast/element.hpp>
+#include <ast/equation.hpp>
+#include <ast/expression.hpp>
+#include <ast/modification.hpp>
+#include <ast/statement.hpp>
+#include <ir/class.hpp>
+#include <ir/expression.hpp>
+#include <ir/helpers.hpp>
+#include <ir/stored_definition.hpp>
+#include <util/error.hpp>
+#include <util/symbol_table.hpp>
+#include <util/type.hpp>
+#include <util/visitors/array_use.hpp>
+#include <util/visitors/eval_init_exp.hpp>
+#include <util/visitors/discrete_assignment.hpp>
 
 namespace MicroModelica {
 using namespace Util;
diff --git a/src/mmoc/ir/mmo_ir.hpp b/src/mmoc/ir/mmo_ir.hpp
index 6a10b29b..8dc9765a 100644
--- a/src/mmoc/ir/mmo_ir.hpp
+++ b/src/mmoc/ir/mmo_ir.hpp
@@ -22,9 +22,9 @@
 #include <list>
 #include <string>
 
-#include <ast/ast_types.h>
-#include <util/ast_util.h>
-#include <ir/stored_definition.h>
+#include <ast/ast_types.hpp>
+#include <util/ast_util.hpp>
+#include <ir/stored_definition.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/mmo_model_checker.cpp b/src/mmoc/ir/mmo_model_checker.cpp
index f3ce6ce5..21f6aeb1 100644
--- a/src/mmoc/ir/mmo_model_checker.cpp
+++ b/src/mmoc/ir/mmo_model_checker.cpp
@@ -17,18 +17,18 @@
 
  ******************************************************************************/
 
-#include "mmo_model_checker.h"
-
-#include <ast/class.h>
-#include <ast/composition.h>
-#include <ast/element.h>
-#include <ast/equation.h>
-#include <ast/expression.h>
-#include <ast/modification.h>
-#include <ast/statement.h>
-#include <ast/stored_definition.h>
-#include <util/error.h>
-#include <util/util.h>
+#include "mmo_model_checker.hpp"
+
+#include <ast/class.hpp>
+#include <ast/composition.hpp>
+#include <ast/element.hpp>
+#include <ast/equation.hpp>
+#include <ast/expression.hpp>
+#include <ast/modification.hpp>
+#include <ast/statement.hpp>
+#include <ast/stored_definition.hpp>
+#include <util/error.hpp>
+#include <util/util.hpp>
 
 using namespace MicroModelica::Util;
 
diff --git a/src/mmoc/ir/mmo_model_checker.hpp b/src/mmoc/ir/mmo_model_checker.hpp
index 95a29557..ffec5db0 100644
--- a/src/mmoc/ir/mmo_model_checker.hpp
+++ b/src/mmoc/ir/mmo_model_checker.hpp
@@ -21,9 +21,9 @@
 
 #include <string>
 
-#include <ast/ast_types.h>
-#include <util/ast_util.h>
-#include <util/util_types.h>
+#include <ast/ast_types.hpp>
+#include <util/ast_util.hpp>
+#include <util/util_types.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/mmo_settings.cpp b/src/mmoc/ir/mmo_settings.cpp
index 9a014954..f8fda1cc 100644
--- a/src/mmoc/ir/mmo_settings.cpp
+++ b/src/mmoc/ir/mmo_settings.cpp
@@ -17,12 +17,12 @@
 
  ******************************************************************************/
 
-#include "mmo_settings.h"
+#include "mmo_settings.hpp"
 
-#include "../ast/class.h"
-#include "../ast/modification.h"
-#include "../util/error.h"
-#include "class.h"
+#include <ast/class.hpp>
+#include <ast/modification.hpp>
+#include "class.hpp"
+#include <util/error.hpp>
 
 namespace MicroModelica {
 using namespace Util;
diff --git a/src/mmoc/ir/mmo_settings.hpp b/src/mmoc/ir/mmo_settings.hpp
index 097bb87b..1a171870 100644
--- a/src/mmoc/ir/mmo_settings.hpp
+++ b/src/mmoc/ir/mmo_settings.hpp
@@ -22,9 +22,9 @@
 
 #include <string>
 
-#include "../ast/ast_types.h"
-#include "../util/ast_util.h"
-#include "class.h"
+#include <ast/ast_types.hpp>
+#include "../util/ast_util.hpp"
+#include "class.hpp"
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/model.cpp b/src/mmoc/ir/model.cpp
index c67f2e47..bfcecbe9 100644
--- a/src/mmoc/ir/model.cpp
+++ b/src/mmoc/ir/model.cpp
@@ -24,14 +24,14 @@
 #include <sstream>
 #include <utility>
 
-#include "../ast/ast_builder.h"
-#include "../ast/composition.h"
-#include "../ast/equation.h"
-#include "../ast/expression.h"
-#include "../ast/modification.h"
-#include "../ast/statement.h"
-#include "../util/ast_util.h"
-#include "../util/symbol_table.h"
+#include <ast/ast_builder.hpp>
+#include "../ast/composition.hpp"
+#include <ast/equation.hpp>
+#include "../ast/expression.hpp"
+#include <ast/modification.hpp>
+#include <ast/statement.hpp>
+#include "../util/ast_util.hpp"
+#include "../util/symbol_table.hpppp"
 
 MMO_Model::MMO_Model(string name) {}
 
diff --git a/src/mmoc/ir/model.hpp b/src/mmoc/ir/model.hpp
index 4ae6d050..964647ba 100644
--- a/src/mmoc/ir/model.hpp
+++ b/src/mmoc/ir/model.hpp
@@ -25,9 +25,9 @@
 #include <string>
 #include <vector>
 
-#include "class.h"
+#include "class.hpp"
 
-#include "../util/util_types.h"
+#include "../util/util_types.hpp"
 
 /**
  *
diff --git a/src/mmoc/ir/model_matrix.cpp b/src/mmoc/ir/model_matrix.cpp
index 106aa79e..48110fb4 100644
--- a/src/mmoc/ir/model_matrix.cpp
+++ b/src/mmoc/ir/model_matrix.cpp
@@ -17,13 +17,13 @@
 
  ******************************************************************************/
 
-#include "model_matrix.h"
+#include "model_matrix.hpp"
 
 #include <sstream>
 
-#include <deps/builders/eq_graph_builder.h>
-#include <ir/user_def_matrix.h>
-#include <util/model_config.h>
+#include <deps/builders/eq_graph_builder.hpp>
+#include <ir/user_def_matrix.hpp>
+#include <util/model_config.hpp>
 
 namespace MicroModelica {
 using namespace Deps;
@@ -32,7 +32,7 @@ using namespace Util;
 namespace IR {
 
 template <typename GraphBuilder, typename MatrixBuilder, typename Config, typename T, typename N>
-ModelMatrix<GraphBuilder, MatrixBuilder, Config, T, N>::ModelMatrix() : _mode(MATRIX::Normal), _access({"",""})
+ModelMatrix<GraphBuilder, MatrixBuilder, Config, T, N>::ModelMatrix() : _mode(MATRIX::Normal), _access({"", ""})
 {
 }
 
@@ -98,7 +98,7 @@ void ModelMatrix<GraphBuilder, MatrixBuilder, Config, T, N>::append(ModelMatrixD
   _model_matrix_def.alloc[MATRIX::Normal].append(def.alloc[MATRIX::Normal]);
   _model_matrix_def.init[MATRIX::Normal].append(def.init[MATRIX::Normal]);
   _model_matrix_def.alloc[MATRIX::Transpose].append(def.alloc[MATRIX::Transpose]);
-  _model_matrix_def.init[MATRIX::Transpose].append(def.init[MATRIX::Transpose]); 
+  _model_matrix_def.init[MATRIX::Transpose].append(def.init[MATRIX::Transpose]);
 }
 
 template class ModelMatrix<SDSBGraphBuilder, Deps::EQModelMatrixBuilder, MATRIX::EQMatrixConfig, IR::EquationTable, IR::Equation>;
diff --git a/src/mmoc/ir/model_matrix.hpp b/src/mmoc/ir/model_matrix.hpp
index b6d0367d..ac61734a 100644
--- a/src/mmoc/ir/model_matrix.hpp
+++ b/src/mmoc/ir/model_matrix.hpp
@@ -21,11 +21,11 @@
 
 #include <string>
 
-#include <deps/builders/eq_graph_builder.h>
-#include <deps/builders/ev_graph_builder.h>
-#include <deps/builders/merge_graph.h>
-#include <deps/sb_dependencies.h>
-#include <ir/model_matrix_gen.h>
+#include <deps/builders/eq_graph_builder.hpp>
+#include <deps/builders/ev_graph_builder.hpp>
+#include <deps/builders/merge_graph.hpp>
+#include <deps/sb_dependencies.hpp>
+#include <ir/model_matrix_gen.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/model_matrix_gen.cpp b/src/mmoc/ir/model_matrix_gen.cpp
index bc3c7dcc..dc3f2f50 100644
--- a/src/mmoc/ir/model_matrix_gen.cpp
+++ b/src/mmoc/ir/model_matrix_gen.cpp
@@ -17,20 +17,20 @@
 
  ******************************************************************************/
 
-#include "model_matrix_gen.h"
+#include "model_matrix_gen.hpp"
 
 #include <sstream>
 
-#include <deps/builders/eq_graph_builder.h>
-#include <deps/sbg_graph/build_from_exps.h>
-#include <deps/sb_dependencies.h>
-#include <ast/parser/parse.h>
-#include <util/model_config.h>
-#include <util/util.h>
-#include <util/symbol_table.h>
-#include <ir/derivative.h>
-#include <ir/helpers.h>
-#include <ir/index.h>
+#include <ast/parser/parse.hpp>
+#include <deps/builders/eq_graph_builder.hpp>
+#include <deps/sbg_graph/build_from_exps.hpp>
+#include <deps/sb_dependencies.hpp>
+#include <ir/derivative.hpp>
+#include <ir/helpers.hpp>
+#include <ir/index.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/symbol_table.hpp>
 
 namespace MicroModelica {
 using namespace Deps;
diff --git a/src/mmoc/ir/model_matrix_gen.hpp b/src/mmoc/ir/model_matrix_gen.hpp
index f64c19bc..5d19527b 100644
--- a/src/mmoc/ir/model_matrix_gen.hpp
+++ b/src/mmoc/ir/model_matrix_gen.hpp
@@ -22,11 +22,11 @@
 #include <string>
 #include <map>
 
-#include <ir/compute_deps.h>
-#include <ir/statement.h>
-#include <ir/node_selector.h>
-#include <deps/sbg_graph/deps_graph.h>
-#include <util/symbol_table.h>
+#include <ir/compute_deps.hpp>
+#include <ir/statement.hpp>
+#include <ir/node_selector.hpp>
+#include <deps/sbg_graph/deps_graph.hpp>
+#include <util/symbol_table.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/node_selector.cpp b/src/mmoc/ir/node_selector.cpp
index 1e1cd187..dd9d73e1 100644
--- a/src/mmoc/ir/node_selector.cpp
+++ b/src/mmoc/ir/node_selector.cpp
@@ -17,16 +17,16 @@
 
  ******************************************************************************/
 
-#include "node_selector.h"
+#include "node_selector.hpp"
 
-#include <deps/sbg_graph/build_from_exps.h>
+#include <deps/sbg_graph/build_from_exps.hpp>
 
 namespace MicroModelica {
 using namespace IR;
 
 namespace Deps {
 
-EQSelector::EQSelector(EquationTable eqs) : _eqs(eqs), _select_states(false), _lhs_states(false) {};
+EQSelector::EQSelector(EquationTable eqs) : _eqs(eqs), _select_states(false), _lhs_states(false){};
 
 IR::EquationTable EQSelector::getNodes() const { return _eqs; };
 
@@ -62,7 +62,7 @@ bool EQSelector::isAlgebraic(SB::Deps::SetVertex vertex)
   return eq.type() == EQUATION::Algebraic;
 }
 
-int EQSelector::id(SB::Deps::SetVertex vertex) { return getEquation(vertex, _eqs).id(); }; 
+int EQSelector::id(SB::Deps::SetVertex vertex) { return getEquation(vertex, _eqs).id(); };
 
 IR::Expression EQSelector::exp(Equation eq) { return eq.lhs(); }
 
@@ -93,7 +93,7 @@ EVSelector::EVSelector(IR::EventTable evs) : _evs(evs) {}
 IR::EventTable EVSelector::getNodes() const { return _evs; }
 
 IR::Event EVSelector::getNode(int id)
-{ 
+{
   Option<Event> ev = _evs[id];
   assert(ev);
   return ev.get();
@@ -104,18 +104,15 @@ IR::Event EVSelector::setUsage(IR::Index ifr_idx, IR::Event ev, Option<IR::Range
 IR::Event EVSelector::getScalarUsage(SB::Set range, IR::Expression exp, IR::Event ev, IR::Index ifr_idx) { return ev; }
 
 bool EVSelector::isAlgebraic(SB::Deps::SetVertex vertex)
-{ 
+{
   if (vertex.desc().type() == SB::Deps::VERTEX::Equation) {
-    Equation eq = getEquation(vertex);  
+    Equation eq = getEquation(vertex);
     return eq.type() == EQUATION::Algebraic;
   }
-  return false; 
+  return false;
 }
 
-int EVSelector::id(SB::Deps::SetVertex vertex) 
-{ 
-  return getEvent(vertex).id();
-}; 
+int EVSelector::id(SB::Deps::SetVertex vertex) { return getEvent(vertex).id(); };
 
 IR::Expression EVSelector::exp(Event ev) { return ev.zeroCrossing().index().expression(); }
 
diff --git a/src/mmoc/ir/node_selector.hpp b/src/mmoc/ir/node_selector.hpp
index a71de305..2cf0466c 100644
--- a/src/mmoc/ir/node_selector.hpp
+++ b/src/mmoc/ir/node_selector.hpp
@@ -19,12 +19,12 @@
 
 #pragma once
 
-#include <ir/index.h>
-#include <ir/equation.h>
-#include <ir/expression.h>
-#include <ir/event.h>
-#include <deps/sbg_graph/deps_graph.h>
-#include <util/symbol_table.h>
+#include <ir/index.hpp>
+#include <ir/equation.hpp>
+#include <ir/expression.hpp>
+#include <ir/event.hpp>
+#include <deps/sbg_graph/deps_graph.hpp>
+#include <util/symbol_table.hpp>
 
 namespace MicroModelica {
 namespace Deps {
diff --git a/src/mmoc/ir/qss_model.cpp b/src/mmoc/ir/qss_model.cpp
index c537cd27..9c648834 100644
--- a/src/mmoc/ir/qss_model.cpp
+++ b/src/mmoc/ir/qss_model.cpp
@@ -17,20 +17,20 @@
 
  ******************************************************************************/
 
-#include "qss_model.h"
+#include "qss_model.hpp"
 
 #include <sstream>
 
-#include <deps/builders/eq_graph_builder.h>
-#include <deps/sbg_graph/build_from_exps.h>
-#include <deps/sb_dependencies.h>
-#include <ast/parser/parse.h>
-#include <util/model_config.h>
-#include <util/util.h>
-#include <util/symbol_table.h>
-#include <ir/derivative.h>
-#include <ir/helpers.h>
-#include <ir/index.h>
+#include <ast/parser/parse.hpp>
+#include <deps/builders/eq_graph_builder.hpp>
+#include <deps/sbg_graph/build_from_exps.hpp>
+#include <deps/sb_dependencies.hpp>
+#include <ir/derivative.hpp>
+#include <ir/helpers.hpp>
+#include <ir/index.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/symbol_table.hpp>
 
 namespace MicroModelica {
 using namespace Deps;
diff --git a/src/mmoc/ir/qss_model.hpp b/src/mmoc/ir/qss_model.hpp
index 815ac3f3..7d255f79 100644
--- a/src/mmoc/ir/qss_model.hpp
+++ b/src/mmoc/ir/qss_model.hpp
@@ -22,12 +22,12 @@
 #include <string>
 #include <map>
 
-#include <ir/compute_deps.h>
-#include <ir/equation.h>
-#include <deps/builders/eq_graph_builder.h>
-#include <deps/sbg_graph/deps_graph.h>
-#include <util/symbol_table.h>
-#include <util/table.h>
+#include <ir/compute_deps.hpp>
+#include <ir/equation.hpp>
+#include <deps/builders/eq_graph_builder.hpp>
+#include <deps/sbg_graph/deps_graph.hpp>
+#include <util/symbol_table.hpp>
+#include <util/table.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/qss_model_deps.cpp b/src/mmoc/ir/qss_model_deps.cpp
index 7cff7744..065e60b7 100644
--- a/src/mmoc/ir/qss_model_deps.cpp
+++ b/src/mmoc/ir/qss_model_deps.cpp
@@ -17,21 +17,21 @@
 
  ******************************************************************************/
 
-#include "qss_model_deps.h"
+#include "qss_model_deps.hpp"
 
 #include <boost/algorithm/string/trim.hpp>
 #include <sstream>
 
-#include <deps/builders/eq_graph_builder.h>
-#include <deps/sbg_graph/build_from_exps.h>
-#include <deps/sb_dependencies.h>
-#include <ast/parser/parse.h>
-#include <util/model_config.h>
-#include <util/util.h>
-#include <util/symbol_table.h>
-#include <ir/derivative.h>
-#include <ir/helpers.h>
-#include <ir/index.h>
+#include <ast/parser/parse.hpp>
+#include <deps/builders/eq_graph_builder.hpp>
+#include <deps/sbg_graph/build_from_exps.hpp>
+#include <deps/sb_dependencies.hpp>
+#include <ir/derivative.hpp>
+#include <ir/helpers.hpp>
+#include <ir/index.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/symbol_table.hpp>
 
 namespace MicroModelica {
 using namespace Deps;
diff --git a/src/mmoc/ir/qss_model_deps.hpp b/src/mmoc/ir/qss_model_deps.hpp
index 8fe80919..8e2fcff5 100644
--- a/src/mmoc/ir/qss_model_deps.hpp
+++ b/src/mmoc/ir/qss_model_deps.hpp
@@ -22,11 +22,11 @@
 #include <string>
 #include <map>
 
-#include <ir/compute_deps.h>
-#include <ir/equation.h>
-#include <deps/sbg_graph/deps_graph.h>
-#include <util/symbol_table.h>
-#include <util/table.h>
+#include <ir/compute_deps.hpp>
+#include <ir/equation.hpp>
+#include <deps/sbg_graph/deps_graph.hpp>
+#include <util/symbol_table.hpp>
+#include <util/table.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/reduction_functions.hpp b/src/mmoc/ir/reduction_functions.hpp
index 340e8b36..72a0d770 100644
--- a/src/mmoc/ir/reduction_functions.hpp
+++ b/src/mmoc/ir/reduction_functions.hpp
@@ -22,11 +22,11 @@
 
 #include <string>
 
-#include "../util/symbol_table.h"
-#include "../util/util.h"
-#include "../util/visitors/convert_cont_red.h"
-#include "../util/visitors/convert_disc_red.h"
-#include "helpers.h"
+#include <util/symbol_table.hpp>
+#include <util/util.hpp>
+#include <util/visitors/convert_cont_red.hpp>
+#include <util/visitors/convert_disc_red.hpp>
+#include "helpers.hpp"
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/statement.cpp b/src/mmoc/ir/statement.cpp
index f0fe060a..76960c37 100644
--- a/src/mmoc/ir/statement.cpp
+++ b/src/mmoc/ir/statement.cpp
@@ -18,14 +18,14 @@
  ******************************************************************************/
 #include <sstream>
 
-#include <ast/ast_builder.h>
-#include <ast/statement.h>
-#include <ir/helpers.h>
-#include <ir/statement.h>
-#include <util/model_config.h>
-#include <util/util.h>
-#include <util/process_statement.h>
-#include <util/visitors/called_functions.h>
+#include <ast/ast_builder.hpp>
+#include <ast/statement.hpp>
+#include <ir/helpers.hpp>
+#include <ir/statement.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/process_statement.hpp>
+#include <util/visitors/called_functions.hpp>
 
 namespace MicroModelica {
 using namespace Util;
diff --git a/src/mmoc/ir/statement.hpp b/src/mmoc/ir/statement.hpp
index 3319d86c..6bc8a8f8 100644
--- a/src/mmoc/ir/statement.hpp
+++ b/src/mmoc/ir/statement.hpp
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <ast/ast_types.h>
-#include <ir/index.h>
-#include <util/table.h>
+#include <ast/ast_types.hpp>
+#include <ir/index.hpp>
+#include <util/table.hpp>
 
 namespace MicroModelica {
 
diff --git a/src/mmoc/ir/stored_definition.cpp b/src/mmoc/ir/stored_definition.cpp
index 17a98480..f6c2627d 100644
--- a/src/mmoc/ir/stored_definition.cpp
+++ b/src/mmoc/ir/stored_definition.cpp
@@ -19,7 +19,7 @@
 
 #include <boost/variant/variant.hpp>
 #include <boost/variant/get.hpp>
-#include "stored_definition.h"
+#include "stored_definition.hpp"
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/stored_definition.hpp b/src/mmoc/ir/stored_definition.hpp
index 36587eee..092407ae 100644
--- a/src/mmoc/ir/stored_definition.hpp
+++ b/src/mmoc/ir/stored_definition.hpp
@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include <ir/class.h>
+#include <ir/class.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/ir/user_def_matrix.cpp b/src/mmoc/ir/user_def_matrix.cpp
index 890e0825..6ff29105 100644
--- a/src/mmoc/ir/user_def_matrix.cpp
+++ b/src/mmoc/ir/user_def_matrix.cpp
@@ -20,10 +20,10 @@
 #include <assert.h>
 #include <string>
 
-#include <util/model_config.h>
-#include <ir/user_def_matrix.h>
-#include <util/error.h>
-#include <util/visitors/convert_output_range.h>
+#include <util/model_config.hpp>
+#include <ir/user_def_matrix.hpp>
+#include <util/error.hpp>
+#include <util/visitors/convert_output_range.hpp>
 
 namespace MicroModelica {
 using namespace Util;
diff --git a/src/mmoc/ir/user_def_matrix.hpp b/src/mmoc/ir/user_def_matrix.hpp
index 975b1972..6bbb752d 100644
--- a/src/mmoc/ir/user_def_matrix.hpp
+++ b/src/mmoc/ir/user_def_matrix.hpp
@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include <ir/model_matrix_gen.h>
+#include <ir/model_matrix_gen.hpp>
 
 namespace MicroModelica {
 namespace IR {
diff --git a/src/mmoc/main.cpp b/src/mmoc/main.cpp
index 62cd4132..1b0fe616 100644
--- a/src/mmoc/main.cpp
+++ b/src/mmoc/main.cpp
@@ -24,21 +24,21 @@
 #include <list>
 #include <string>
 
-#include "ast/ast_types.h"
-#include "ast/stored_definition.h"
-#include "generator/files.h"
-#include "generator/generator.h"
-#include <ir/class.h>
-#include "ir/mmo_ir.h"
-#include "ir/mmo_model_checker.h"
-#include "ir/mmo_settings.h"
-#include <ast/parser/parse.h>
-#include "util/compile_flags.h"
-#include "util/error.h"
-#include "util/logger.h"
-#include "util/symbol_table.h"
-#include "util/util.h"
-#include "util/util_types.h"
+#include <ast/ast_types.hpp>
+#include <ast/parser/parse.hpp>
+#include <ast/stored_definition.hpp>
+#include <generator/files.hpp>
+#include <generator/generator.hpp>
+#include <ir/class.hpp>
+#include <ir/mmo_ir.hpp>
+#include <ir/mmo_model_checker.hpp>
+#include <ir/mmo_settings.hpp>
+#include <util/compile_flags.hpp>
+#include <util/error.hpp>
+#include <util/logger.hpp>
+#include <util/symbol_table.hpp>
+#include <util/util.hpp>
+#include <util/util_types.hpp>
 
 using namespace std;
 using namespace MicroModelica::Generator;
diff --git a/src/mmoc/tests/integration/algebraics_test.cpp b/src/mmoc/tests/integration/algebraics_test.cpp
index b4c13c90..4e94feae 100644
--- a/src/mmoc/tests/integration/algebraics_test.cpp
+++ b/src/mmoc/tests/integration/algebraics_test.cpp
@@ -20,11 +20,11 @@
 #include <gtest/gtest.h>
 #include <iostream>
 
-#include "util/model_config.h"
-#include "util/visitors/algebraics.h"
-#include "util/util.h"
-#include "util/symbol_table.h"
-#include <ast/parser/parse.h>
+#include <ast/parser/parse.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/symbol_table.hpp>
+#include <util/visitors/algebraics.hpp>
 
 /// @addtogroup QSSSolverUTests
 /// @{
diff --git a/src/mmoc/tests/integration/array_use_test.cpp b/src/mmoc/tests/integration/array_use_test.cpp
index 2deca2e0..a901d47f 100644
--- a/src/mmoc/tests/integration/array_use_test.cpp
+++ b/src/mmoc/tests/integration/array_use_test.cpp
@@ -21,11 +21,11 @@
 #include <gmock/gmock.h>
 #include <iostream>
 
-#include <ast/parser/parse.h>
-#include "util/model_config.h"
-#include "util/visitors/array_use.h"
-#include "util/symbol_table.h"
-#include "tests/test_utils.h"
+#include <ast/parser/parse.hpp>
+#include <tests/test_utils.hpp>
+#include <util/model_config.hpp>
+#include <util/visitors/array_use.hpp>
+#include <util/symbol_table.hpp>
 
 /// @addtogroup QSSSolverUTests
 /// @{
diff --git a/src/mmoc/tests/integration/autonomous_test.cpp b/src/mmoc/tests/integration/autonomous_test.cpp
index c5d9e658..56b6993f 100644
--- a/src/mmoc/tests/integration/autonomous_test.cpp
+++ b/src/mmoc/tests/integration/autonomous_test.cpp
@@ -17,15 +17,15 @@
 
  ******************************************************************************/
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include <iostream>
 
-#include <ast/parser/parse.h>
-#include "util/model_config.h"
-#include "util/visitors/autonomous.h"
-#include "util/symbol_table.h"
-#include "tests/test_utils.h"
+#include <ast/parser/parse.hpp>
+#include <tests/test_utils.hpp>
+#include <util/model_config.hpp>
+#include <util/visitors/autonomous.hpp>
+#include <util/symbol_table.hpp>
 
 /// @addtogroup QSSSolverUTests
 /// @{
diff --git a/src/mmoc/tests/integration/called_functions_test.cpp b/src/mmoc/tests/integration/called_functions_test.cpp
index 2ce814d6..10d4649c 100644
--- a/src/mmoc/tests/integration/called_functions_test.cpp
+++ b/src/mmoc/tests/integration/called_functions_test.cpp
@@ -21,10 +21,10 @@
 #include <gmock/gmock.h>
 #include <iostream>
 
-#include <ast/parser/parse.h>
-#include "util/visitors/called_functions.h"
-#include "util/util.h"
-#include "tests/test_utils.h"
+#include <ast/parser/parse.hpp>
+#include <tests/test_utils.hpp>
+#include <util/util.hpp>
+#include <util/visitors/called_functions.hpp>
 
 /// @addtogroup QSSSolverUTests
 /// @{
diff --git a/src/mmoc/tests/integration/convert_cont_red_test.cpp b/src/mmoc/tests/integration/convert_cont_red_test.cpp
index c15e41b9..dfdc097f 100644
--- a/src/mmoc/tests/integration/convert_cont_red_test.cpp
+++ b/src/mmoc/tests/integration/convert_cont_red_test.cpp
@@ -20,12 +20,12 @@
 #include <gtest/gtest.h>
 #include <iostream>
 
-#include <ast/parser/parse.h>
-#include "util/visitors/convert_cont_red.h"
-#include "util/model_config.h"
-#include "util/util.h"
-#include "util/symbol_table.h"
-#include "tests/test_utils.h"
+#include <ast/parser/parse.hpp>
+#include <tests/test_utils.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/symbol_table.hpp>
+#include <util/visitors/convert_cont_red.hpp>
 
 /// @addtogroup QSSSolverUTests
 /// @{
diff --git a/src/mmoc/tests/test_utils.cpp b/src/mmoc/tests/test_utils.cpp
index 0c0add5c..4439e130 100644
--- a/src/mmoc/tests/test_utils.cpp
+++ b/src/mmoc/tests/test_utils.cpp
@@ -17,12 +17,12 @@
 
  ******************************************************************************/
 
-#include "test_utils.h"
+#include "test_utils.hpp"
 
-#include <ast/element.h>
-#include <ast/ast_builder.h>
-#include <ast/parser/parse.h>
-#include <util/visitors/eval_init_exp.h>
+#include <ast/element.hpp>
+#include <ast/ast_builder.hpp>
+#include <ast/parser/parse.hpp>
+#include <util/visitors/eval_init_exp.hpp>
 
 using namespace MicroModelica::Util;
 
diff --git a/src/mmoc/tests/test_utils.hpp b/src/mmoc/tests/test_utils.hpp
index 028f882e..8d186944 100644
--- a/src/mmoc/tests/test_utils.hpp
+++ b/src/mmoc/tests/test_utils.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <util/util.h>
-#include <util/symbol_table.h>
+#include <util/util.hpp>
+#include <util/symbol_table.hpp>
 
 MicroModelica::Util::VarSymbolTable getSymbols(string variable_definition);
\ No newline at end of file
diff --git a/src/mmoc/util/ast_util.cpp b/src/mmoc/util/ast_util.cpp
index ca1b4c32..921a3665 100644
--- a/src/mmoc/util/ast_util.cpp
+++ b/src/mmoc/util/ast_util.cpp
@@ -17,7 +17,7 @@
 
  ******************************************************************************/
 
-#include "ast_util.h"
+#include "ast_util.hpp"
 
 #include <math.h>
 #include <list>
@@ -25,23 +25,23 @@
 #include <set>
 #include <sstream>
 
-#include "../ast/ast_builder.h"
-#include "../ast/modification.h"
-#include "../ast/equation.h"
-#include "../ast/statement.h"
-#include <ast/parser/parse.h>
-#include "../ir/annotation.h"
-#include "../ir/class.h"
-#include "../ir/equation.h"
-#include "../ir/expression.h"
-#include "../ir/event.h"
-#include "debug.h"
-#include "error.h"
-#include "macros.h"
-#include "model_config.h"
-#include "symbol_table.h"
-#include "type.h"
-#include "util.h"
+#include <ast/ast_builder.hpp>
+#include <ast/equation.hpp>
+#include <ast/modification.hpp>
+#include <ast/parser/parse.hpp>
+#include <ast/statement.hpp>
+#include "debug.hpp"
+#include "error.hpp"
+#include <ir/annotation.hpp>
+#include <ir/class.hpp>
+#include <ir/equation.hpp>
+#include <ir/expression.hpp>
+#include <ir/event.hpp>
+#include "macros.hpp"
+#include "model_config.hpp"
+#include "symbol_table.hpp"
+#include "type.hpp"
+#include "util.hpp"
 
 using namespace MicroModelica::Util;
 using namespace MicroModelica::IR;
diff --git a/src/mmoc/util/ast_util.hpp b/src/mmoc/util/ast_util.hpp
index 338bcb13..f73f8478 100644
--- a/src/mmoc/util/ast_util.hpp
+++ b/src/mmoc/util/ast_util.hpp
@@ -21,14 +21,14 @@
 
 #include <string>
 
-#include <ast/ast_types.h>
-#include <ast/ast_builder.h>
-#include <ast/expression.h>
-#include <ast/statement.h>
-#include <ast/equation.h>
-#include <ir/index.h>
-#include <ir/event.h>
-#include "util_types.h"
+#include <ast/ast_types.hpp>
+#include <ast/ast_builder.hpp>
+#include <ast/expression.hpp>
+#include <ast/statement.hpp>
+#include <ast/equation.hpp>
+#include <ir/index.hpp>
+#include <ir/event.hpp>
+#include "util_types.hpp"
 
 #define IS_CREF(X) ((X)->expressionType() == EXPCOMPREF)
 #define IS_UMINUS(X) ((X)->expressionType() == EXPUMINUS)
diff --git a/src/mmoc/util/compile_flags.cpp b/src/mmoc/util/compile_flags.cpp
index 7079a50a..d835fee8 100644
--- a/src/mmoc/util/compile_flags.cpp
+++ b/src/mmoc/util/compile_flags.cpp
@@ -17,11 +17,11 @@
 
  ******************************************************************************/
 
-#include "compile_flags.h"
+#include "compile_flags.hpp"
 
 #include <utility>
 
-#include "util.h"
+#include "util.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/compile_flags.hpp b/src/mmoc/util/compile_flags.hpp
index 4f0facd2..cffc1bdc 100644
--- a/src/mmoc/util/compile_flags.hpp
+++ b/src/mmoc/util/compile_flags.hpp
@@ -23,7 +23,7 @@
 #include <map>
 #include <string>
 
-#include "util_types.h"
+#include "util_types.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/debug.cpp b/src/mmoc/util/debug.cpp
index daf97310..23f2e4e6 100644
--- a/src/mmoc/util/debug.cpp
+++ b/src/mmoc/util/debug.cpp
@@ -17,7 +17,7 @@
 
  ******************************************************************************/
 
-#include "debug.h"
+#include "debug.hpp"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/mmoc/util/error.cpp b/src/mmoc/util/error.cpp
index fc498edd..7a96d651 100644
--- a/src/mmoc/util/error.cpp
+++ b/src/mmoc/util/error.cpp
@@ -17,7 +17,7 @@
 
  ******************************************************************************/
 
-#include "error.h"
+#include "error.hpp"
 
 #include <stdarg.h>
 #include <iostream>
diff --git a/src/mmoc/util/ginac_interface.cpp b/src/mmoc/util/ginac_interface.cpp
index 1e1bfdfb..ed1a758f 100644
--- a/src/mmoc/util/ginac_interface.cpp
+++ b/src/mmoc/util/ginac_interface.cpp
@@ -17,7 +17,7 @@
 
  ******************************************************************************/
 
-#include "ginac_interface.h"
+#include "ginac_interface.hpp"
 
 #include <assert.h>
 #include <ginac/add.h>
@@ -35,13 +35,13 @@
 #include <sstream>
 #include <utility>
 
-#include "../ast/ast_builder.h"
-#include "../ast/expression.h"
-#include "../ir/expression.h"
-#include <ast/parser/parse.h>
-#include "model_config.h"
-#include "symbol_table.h"
-#include "util.h"
+#include <ast/ast_builder.hpp>
+#include "../ast/expression.hpp"
+#include <ir/expression.hpp>
+#include <ast/parser/parse.hpp>
+#include "model_config.hpp"
+#include "symbol_table.hpp"
+#include "util.hpp"
 
 using namespace GiNaC;
 using namespace MicroModelica::IR;
@@ -99,10 +99,7 @@ void my_print_add_dflt(const add& s, const print_dflt& c, unsigned level)
   if (level >= power_prec) c.s << ')';
 }
 
-ConvertToGiNaC::ConvertToGiNaC(Option<Expression> exp)
-    : _replaceDer(true), _generateIndexes(false), _exp(exp)
-{
-}
+ConvertToGiNaC::ConvertToGiNaC(Option<Expression> exp) : _replaceDer(true), _generateIndexes(false), _exp(exp) {}
 
 ex ConvertToGiNaC::convert(AST_Expression e, bool replaceDer, bool generateIndexes)
 {
diff --git a/src/mmoc/util/ginac_interface.hpp b/src/mmoc/util/ginac_interface.hpp
index e0a0982c..034568b3 100644
--- a/src/mmoc/util/ginac_interface.hpp
+++ b/src/mmoc/util/ginac_interface.hpp
@@ -26,10 +26,10 @@
 #include <map>
 #include <string>
 
-#include "../ast/ast_types.h"
-#include "../ir/built_in_functions.h"
-#include "ast_util.h"
-#include "util_types.h"
+#include "ast_util.hpp"
+#include <ast/ast_types.hpp>
+#include <ir/built_in_functions.hpp>
+#include "util_types.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/graph.cpp b/src/mmoc/util/graph.cpp
index bb9390e7..78e6d46f 100644
--- a/src/mmoc/util/graph.cpp
+++ b/src/mmoc/util/graph.cpp
@@ -17,7 +17,7 @@
 
  ******************************************************************************/
 
-#include "graph.h"
+#include "graph.hpp"
 
 #include <iostream>
 
diff --git a/src/mmoc/util/graph.hpp b/src/mmoc/util/graph.hpp
index c173b7fb..7b82db8f 100644
--- a/src/mmoc/util/graph.hpp
+++ b/src/mmoc/util/graph.hpp
@@ -23,7 +23,7 @@
 #include <map>
 #include <set>
 
-#include "graph_profile.h"
+#include "graph_profile.hpp"
 
 using namespace std;
 
diff --git a/src/mmoc/util/graph_profile.cpp b/src/mmoc/util/graph_profile.cpp
index 94c38517..539a8309 100644
--- a/src/mmoc/util/graph_profile.cpp
+++ b/src/mmoc/util/graph_profile.cpp
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-#include "graph_profile.h"
+#include "graph_profile.hpp"
 
 double GRP_nodeWeight(GRP_graphProfile g, GRP_EdgeType type)
 {
diff --git a/src/mmoc/util/logger.cpp b/src/mmoc/util/logger.cpp
index dddb0736..96ede82d 100644
--- a/src/mmoc/util/logger.cpp
+++ b/src/mmoc/util/logger.cpp
@@ -17,9 +17,9 @@
 
  ******************************************************************************/
 
-#include "logger.h"
+#include "logger.hpp"
 
-#include <util/util.h>
+#include <util/util.hpp>
 
 using namespace std;
 
@@ -29,18 +29,18 @@ Logger::Logger() : _log_file(), _logs_path() {}
 
 Logger::~Logger() { log.close(); }
 
-void Logger::setFile(string file_name) 
+void Logger::setFile(string file_name)
 {
-    string build_path = Utils::instance().environmentVariable("MMOC_BUILD");
-    string base_name = Utils::instance().baseFileName(file_name);
-    _logs_path = build_path + SLASH + base_name + SLASH; 
-    _log_file = _logs_path + base_name + ".log";
-    log.open(_log_file, std::ofstream::out);
+  string build_path = Utils::instance().environmentVariable("MMOC_BUILD");
+  string base_name = Utils::instance().baseFileName(file_name);
+  _logs_path = build_path + SLASH + base_name + SLASH;
+  _log_file = _logs_path + base_name + ".log";
+  log.open(_log_file, std::ofstream::out);
 }
 
-std::string Logger::getLoggerFile() const  { return _log_file; }
+std::string Logger::getLoggerFile() const { return _log_file; }
 
-std::string Logger::getLogsPath() const  { return _logs_path; }
+std::string Logger::getLogsPath() const { return _logs_path; }
 
 }  // namespace Util
 }  // namespace MicroModelica
diff --git a/src/mmoc/util/model_config.hpp b/src/mmoc/util/model_config.hpp
index c1054ea6..36f07aa0 100644
--- a/src/mmoc/util/model_config.hpp
+++ b/src/mmoc/util/model_config.hpp
@@ -21,12 +21,12 @@
 
 #include <string>
 
-#include <ir/annotation.h>
-#include <ir/index.h>
-#include <ir/equation.h>
-#include <ir/expression.h>
-#include <util/symbol_table.h>
-#include <util/util.h>
+#include <ir/annotation.hpp>
+#include <ir/index.hpp>
+#include <ir/equation.hpp>
+#include <ir/expression.hpp>
+#include <util/symbol_table.hpp>
+#include <util/util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/process_statement.cpp b/src/mmoc/util/process_statement.cpp
index 524059bc..c1f31d8b 100644
--- a/src/mmoc/util/process_statement.cpp
+++ b/src/mmoc/util/process_statement.cpp
@@ -17,16 +17,16 @@
 
  ******************************************************************************/
 
-#include "../ast/ast_builder.h"
-#include "../ir/helpers.h"
-#include "../ir/reduction_functions.h"
-#include "error.h"
-#include "model_config.h"
-#include "util.h"
-#include "symbol_table.h"
-#include "./visitors/convert_disc_red.h"
+#include <ast/ast_builder.hpp>
+#include <ir/helpers.hpp>
+#include "../ir/reduction_functions.hpp"
+#include "error.hpp"
+#include "model_config.hpp"
+#include "util.hpp"
+#include "symbol_table.hpp"
+#include "./visitors/convert_disc_red.hpp"
 
-#include "process_statement.h"
+#include "process_statement.hpp"
 
 namespace MicroModelica {
 using namespace IR;
@@ -129,8 +129,7 @@ void processStatement(AST_Statement stm)
 void applyReduction(AST_Statement_Assign asg, AST_StatementList stms, AST_StatementListIterator stm_it)
 {
   VarSymbolTable symbols = ModelConfig::instance().symbols();
-  ReductionFunctions<AST_Statement, ConvertDiscRed> reduction_functions(asg->exp(),
-                                                                        Utils::instance().variable(asg->lhs()));
+  ReductionFunctions<AST_Statement, ConvertDiscRed> reduction_functions(asg->exp(), Utils::instance().variable(asg->lhs()));
   AST_Expression new_exp = reduction_functions.apply();
   if (reduction_functions.hasReductionFunctions()) {
     asg->setExp(new_exp);
diff --git a/src/mmoc/util/process_statement.hpp b/src/mmoc/util/process_statement.hpp
index 419b0472..f74b00ff 100644
--- a/src/mmoc/util/process_statement.hpp
+++ b/src/mmoc/util/process_statement.hpp
@@ -20,8 +20,8 @@
 #ifndef PROCESS_STATEMENT_H_
 #define PROCESS_STATEMENT_H_
 
-#include "../ast/ast_types.h"
-#include "../ast/statement.h"
+#include <ast/ast_types.hpp>
+#include <ast/statement.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/symbol_table.cpp b/src/mmoc/util/symbol_table.cpp
index 6ee60f23..960e938c 100644
--- a/src/mmoc/util/symbol_table.cpp
+++ b/src/mmoc/util/symbol_table.cpp
@@ -17,17 +17,17 @@
 
  ******************************************************************************/
 
-#include "symbol_table.h"
+#include "symbol_table.hpp"
 
 #include <math.h>
 #include <sstream>
 
-#include <ast/ast_builder.h>
-#include <ast/expression.h>
-#include <ir/equation.h>
-#include <ir/expression.h>
-#include <ir/helpers.h>
-#include <util/util.h>
+#include <ast/ast_builder.hpp>
+#include <ast/expression.hpp>
+#include <ir/equation.hpp>
+#include <ir/expression.hpp>
+#include <ir/helpers.hpp>
+#include <util/util.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/symbol_table.hpp b/src/mmoc/util/symbol_table.hpp
index b6feb5c0..d8737b27 100644
--- a/src/mmoc/util/symbol_table.hpp
+++ b/src/mmoc/util/symbol_table.hpp
@@ -26,11 +26,11 @@
 #include <string>
 #include <vector>
 
-#include <ast/ast_types.h>
-#include <ast/element.h>
-#include <ast/modification.h>
-#include <util/type.h>
-#include <util/table.h>
+#include <ast/ast_types.hpp>
+#include <ast/element.hpp>
+#include <ast/modification.hpp>
+#include <util/type.hpp>
+#include <util/table.hpp>
 
 namespace MicroModelica {
 
diff --git a/src/mmoc/util/table.hpp b/src/mmoc/util/table.hpp
index 5adf4c90..054bd454 100644
--- a/src/mmoc/util/table.hpp
+++ b/src/mmoc/util/table.hpp
@@ -21,7 +21,7 @@
 
 #include <map>
 
-#include <util/util_types.h>
+#include <util/util_types.hpp>
 
 template <typename Key, typename Value>
 class ModelTable {
diff --git a/src/mmoc/util/type.cpp b/src/mmoc/util/type.cpp
index 377215fa..5a7d8569 100644
--- a/src/mmoc/util/type.cpp
+++ b/src/mmoc/util/type.cpp
@@ -19,9 +19,9 @@
 
 #include <sstream>
 
-#include "type.h"
+#include "type.hpp"
 
-#include <ast/ast_builder.h>
+#include <ast/ast_builder.hpp>
 
 ostream &operator<<(ostream &os, const Type_ &e)
 {
diff --git a/src/mmoc/util/type.hpp b/src/mmoc/util/type.hpp
index 3a0a7dff..5e3066b2 100644
--- a/src/mmoc/util/type.hpp
+++ b/src/mmoc/util/type.hpp
@@ -23,9 +23,9 @@
 #include <list>
 #include <string>
 
-#include <ast/ast_types.h>
-#include <ast/expression.h>
-#include <util/macros.h>
+#include <ast/ast_types.hpp>
+#include <ast/expression.hpp>
+#include <util/macros.hpp>
 
 enum class SymbolType { TYREAL, TYINTEGER, TYBOOLEAN, TYSTRING, TYARRAY, TYTUPLA, TYFUNCTION };
 
diff --git a/src/mmoc/util/type_check.cpp b/src/mmoc/util/type_check.cpp
index 34bdc552..3aa1d60f 100644
--- a/src/mmoc/util/type_check.cpp
+++ b/src/mmoc/util/type_check.cpp
@@ -23,9 +23,9 @@
 #include <list>
 #include <string>
 
-#include "../ast/ast_builder.h"
-#include "../ast/expression.h"
-#include "symbol_table.h"
+#include <ast/ast_builder.hpp>
+#include "../ast/expression.hpp"
+#include "symbol_table.hpp"
 
 #define T(s) tyEnv->lookup(s)
 
diff --git a/src/mmoc/util/type_check.hpp b/src/mmoc/util/type_check.hpp
index 1a7ef14b..4c7e748e 100644
--- a/src/mmoc/util/type_check.hpp
+++ b/src/mmoc/util/type_check.hpp
@@ -17,9 +17,9 @@
 
  ******************************************************************************/
 
-#include "../ast/ast_types.h"
-#include "type.h"
-#include "util_types.h"
+#include <ast/ast_types.hpp>
+#include "type.hpp"
+#include "util_types.hpp"
 
 #ifndef TYPECHECK_H_
 #define TYPECHECK_H_
diff --git a/src/mmoc/util/util.cpp b/src/mmoc/util/util.cpp
index eee6bfe9..4caf895d 100644
--- a/src/mmoc/util/util.cpp
+++ b/src/mmoc/util/util.cpp
@@ -17,7 +17,7 @@
 
  ******************************************************************************/
 
-#include "util.h"
+#include "util.hpp"
 
 #include <stddef.h>
 #include <cstdlib>
@@ -25,16 +25,16 @@
 #include <sstream>
 #include <utility>
 
-#include "../ir/built_in_functions.h"
-#include "../ir/class.h"
-#include "../ir/expression.h"
-#include "../ir/equation.h"
-#include "../ir/helpers.h"
-#include "../ir/index.h"
-#include "compile_flags.h"
-#include "error.h"
-#include "model_config.h"
-#include "symbol_table.h"
+#include "compile_flags.hpp"
+#include "error.hpp"
+#include <ir/built_in_functions.hpp>
+#include <ir/class.hpp>
+#include <ir/expression.hpp>
+#include <ir/equation.hpp>
+#include <ir/helpers.hpp>
+#include <ir/index.hpp>
+#include "model_config.hpp"
+#include "symbol_table.hpp"
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/util.hpp b/src/mmoc/util/util.hpp
index 10cdd22b..cac37412 100644
--- a/src/mmoc/util/util.hpp
+++ b/src/mmoc/util/util.hpp
@@ -24,12 +24,12 @@
 #include <map>
 #include <string>
 
-#include <ast/ast_types.h>
-#include <deps/model_dependencies.h>
-#include <util/compile_flags.h>
-#include <util/util_types.h>
-#include <util/symbol_table.h>
-#include <util/table.h>
+#include <ast/ast_types.hpp>
+#include <deps/model_dependencies.hpp>
+#include <util/compile_flags.hpp>
+#include <util/util_types.hpp>
+#include <util/symbol_table.hpp>
+#include <util/table.hpp>
 
 namespace MicroModelica {
 
diff --git a/src/mmoc/util/util_types.hpp b/src/mmoc/util/util_types.hpp
index b500b7fb..d26028e2 100644
--- a/src/mmoc/util/util_types.hpp
+++ b/src/mmoc/util/util_types.hpp
@@ -24,7 +24,7 @@
 #include <boost/optional.hpp>
 #include <boost/foreach.hpp>
 
-#include "macros.h"
+#include "macros.hpp"
 
 #define foreach_ BOOST_FOREACH
 
diff --git a/src/mmoc/util/visitors/algebraics.cpp b/src/mmoc/util/visitors/algebraics.cpp
index 1dfa0c69..b642f8e6 100644
--- a/src/mmoc/util/visitors/algebraics.cpp
+++ b/src/mmoc/util/visitors/algebraics.cpp
@@ -17,11 +17,11 @@
 
  ******************************************************************************/
 
-#include "algebraics.h"
+#include "algebraics.hpp"
 
-#include "../../ast/ast_builder.h"
-#include "../model_config.h"
-#include "../util.h"
+#include <ast/ast_builder.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
 
 namespace MicroModelica {
 namespace Util {
@@ -38,7 +38,7 @@ bool Algebraics::foldTraverseElement(AST_Expression e)
     AST_Expression_ComponentReference cr = e->getAsComponentReference();
     Option<Variable> var = ModelConfig::instance().lookup(cr->name());
     if (var) {
-      bool search_var = (_state) ? var->isState() : var->isAlgebraic(); 
+      bool search_var = (_state) ? var->isState() : var->isAlgebraic();
       if (search_var && (var->name() != _var.name())) {
         has_algebraics = true;
         AST_ListAppend(_exps, e);
diff --git a/src/mmoc/util/visitors/algebraics.hpp b/src/mmoc/util/visitors/algebraics.hpp
index 09630d36..95b28cde 100644
--- a/src/mmoc/util/visitors/algebraics.hpp
+++ b/src/mmoc/util/visitors/algebraics.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "../ast_util.h"
+#include "../ast_util.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/apply_var_usage.cpp b/src/mmoc/util/visitors/apply_var_usage.cpp
index 2d45c9fb..5c8f3571 100644
--- a/src/mmoc/util/visitors/apply_var_usage.cpp
+++ b/src/mmoc/util/visitors/apply_var_usage.cpp
@@ -17,12 +17,12 @@
 
  ******************************************************************************/
 
-#include "apply_var_usage.h"
+#include "apply_var_usage.hpp"
 
-#include "../../ast/ast_builder.h"
-#include "../error.h"
-#include "../util.h"
-#include "partial_eval_exp.h"
+#include "../../ast/ast_builder.hpp"
+#include <util/error.hpp>
+#include <util/util.hpp>
+#include "partial_eval_exp.hpp"
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/visitors/apply_var_usage.hpp b/src/mmoc/util/visitors/apply_var_usage.hpp
index 9dbc64f5..e5f5512a 100644
--- a/src/mmoc/util/visitors/apply_var_usage.hpp
+++ b/src/mmoc/util/visitors/apply_var_usage.hpp
@@ -20,8 +20,8 @@
 #ifndef APPLY_VAR_USAGE_H_
 #define APPLY_VAR_USAGE_H_
 
-#include "../../ast/ast_builder.h"
-#include "../ast_util.h"
+#include "../../ast/ast_builder.hpp"
+#include "../ast_util.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/array_use.cpp b/src/mmoc/util/visitors/array_use.cpp
index dd9f80a1..91924c71 100644
--- a/src/mmoc/util/visitors/array_use.cpp
+++ b/src/mmoc/util/visitors/array_use.cpp
@@ -17,10 +17,10 @@
 
  ******************************************************************************/
 
-#include "array_use.h"
-#include "../error.h"
-#include "../model_config.h"
-#include "../symbol_table.h"
+#include "array_use.hpp"
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/symbol_table.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/array_use.hpp b/src/mmoc/util/visitors/array_use.hpp
index 2d99f77f..a8740528 100644
--- a/src/mmoc/util/visitors/array_use.hpp
+++ b/src/mmoc/util/visitors/array_use.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <util/ast_util.h>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/autonomous.cpp b/src/mmoc/util/visitors/autonomous.cpp
index 89a3a22f..b42534cd 100644
--- a/src/mmoc/util/visitors/autonomous.cpp
+++ b/src/mmoc/util/visitors/autonomous.cpp
@@ -17,8 +17,8 @@
 
  ******************************************************************************/
 
-#include "autonomous.h"
-#include "../model_config.h"
+#include "autonomous.hpp"
+#include <util/model_config.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/autonomous.hpp b/src/mmoc/util/visitors/autonomous.hpp
index dd56d8be..ab8cedfb 100644
--- a/src/mmoc/util/visitors/autonomous.hpp
+++ b/src/mmoc/util/visitors/autonomous.hpp
@@ -20,7 +20,7 @@
 #ifndef AUTONOMOUS_H_
 #define AUTONOMOUS_H_
 
-#include "../ast_util.h"
+#include "../ast_util.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/called_functions.cpp b/src/mmoc/util/visitors/called_functions.cpp
index 1ffd2a8a..ec492677 100644
--- a/src/mmoc/util/visitors/called_functions.cpp
+++ b/src/mmoc/util/visitors/called_functions.cpp
@@ -17,9 +17,9 @@
 
  ******************************************************************************/
 
-#include "called_functions.h"
-#include "../error.h"
-#include "../symbol_table.h"
+#include "called_functions.hpp"
+#include <util/error.hpp>
+#include "../symbol_table.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/called_functions.hpp b/src/mmoc/util/visitors/called_functions.hpp
index daca20b8..800aafdb 100644
--- a/src/mmoc/util/visitors/called_functions.hpp
+++ b/src/mmoc/util/visitors/called_functions.hpp
@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include <util/ast_util.h>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/convert_condition.cpp b/src/mmoc/util/visitors/convert_condition.cpp
index 4bb27743..72e029bf 100644
--- a/src/mmoc/util/visitors/convert_condition.cpp
+++ b/src/mmoc/util/visitors/convert_condition.cpp
@@ -17,18 +17,18 @@
 
  ******************************************************************************/
 
-#include "convert_condition.h"
+#include "convert_condition.hpp"
 
 #include <sstream>
 
-#include "convert_expression.h"
-#include "replace_inner_product.h"
-#include "../error.h"
-#include "../util.h"
-#include <ast/parser/parse.h>
-#include "../../ast/ast_types.h"
-#include "../../ast/ast_builder.h"
-#include "../../ir/event.h"
+#include <ast/ast_builder.hpp>
+#include <ast/ast_types.hpp>
+#include <ast/parser/parse.hpp>
+#include "convert_expression.hpp"
+#include <ir/event.hpp>
+#include <util/error.hpp>
+#include <util/util.hpp>
+#include "replace_inner_product.hpp"
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/visitors/convert_condition.hpp b/src/mmoc/util/visitors/convert_condition.hpp
index febeb6f2..35a6db36 100644
--- a/src/mmoc/util/visitors/convert_condition.hpp
+++ b/src/mmoc/util/visitors/convert_condition.hpp
@@ -20,7 +20,7 @@
 #ifndef CONVERT_CONDITION_H_
 #define CONVERT_CONDITION_H_
 
-#include "../ast_util.h"
+#include "../ast_util.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/convert_cont_red.cpp b/src/mmoc/util/visitors/convert_cont_red.cpp
index e86c04d1..f275a7c4 100644
--- a/src/mmoc/util/visitors/convert_cont_red.cpp
+++ b/src/mmoc/util/visitors/convert_cont_red.cpp
@@ -17,25 +17,22 @@
 
  ******************************************************************************/
 
-#include "convert_cont_red.h"
+#include "convert_cont_red.hpp"
 
 #include <sstream>
 
-#include "../error.h"
-#include "../model_config.h"
-#include "../util.h"
-#include <ast/parser/parse.h>
-#include "../../ast/ast_types.h"
-#include "../../ast/ast_builder.h"
+#include <ast/ast_builder.hpp>
+#include <ast/ast_types.hpp>
+#include <ast/parser/parse.hpp>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
 
 namespace MicroModelica {
 using namespace IR;
 namespace Util {
 
-ConvertContRed::ConvertContRed() : _has_reduction(false), _code(), _oper_names(), _oper()
-{
-  setOpers();
-}
+ConvertContRed::ConvertContRed() : _has_reduction(false), _code(), _oper_names(), _oper() { setOpers(); }
 
 void ConvertContRed::setOpers()
 {
diff --git a/src/mmoc/util/visitors/convert_cont_red.hpp b/src/mmoc/util/visitors/convert_cont_red.hpp
index dc115d2f..b5cb5cbb 100644
--- a/src/mmoc/util/visitors/convert_cont_red.hpp
+++ b/src/mmoc/util/visitors/convert_cont_red.hpp
@@ -20,7 +20,7 @@
 #ifndef CONVERT_CONT_RED_H_
 #define CONVERT_CONT_RED_H_
 
-#include "../ast_util.h"
+#include "../ast_util.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/convert_disc_red.cpp b/src/mmoc/util/visitors/convert_disc_red.cpp
index 2041a8d2..20fa0f8c 100644
--- a/src/mmoc/util/visitors/convert_disc_red.cpp
+++ b/src/mmoc/util/visitors/convert_disc_red.cpp
@@ -17,16 +17,16 @@
 
  ******************************************************************************/
 
-#include "convert_disc_red.h"
+#include "convert_disc_red.hpp"
 
 #include <sstream>
 
-#include "../error.h"
-#include "../model_config.h"
-#include "../util.h"
-#include <ast/parser/parse.h>
-#include "../../ast/ast_types.h"
-#include "../../ast/ast_builder.h"
+#include <ast/ast_builder.hpp>
+#include <ast/ast_types.hpp>
+#include <ast/parser/parse.hpp>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/visitors/convert_disc_red.hpp b/src/mmoc/util/visitors/convert_disc_red.hpp
index 57f7a857..e6b0facf 100644
--- a/src/mmoc/util/visitors/convert_disc_red.hpp
+++ b/src/mmoc/util/visitors/convert_disc_red.hpp
@@ -20,7 +20,7 @@
 #ifndef CONVERT_DISC_RED_H_
 #define CONVERT_DISC_RED_H_
 
-#include "../ast_util.h"
+#include "../ast_util.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/convert_equation.cpp b/src/mmoc/util/visitors/convert_equation.cpp
index b9032dfc..4a9d58d8 100644
--- a/src/mmoc/util/visitors/convert_equation.cpp
+++ b/src/mmoc/util/visitors/convert_equation.cpp
@@ -17,16 +17,16 @@
 
  ******************************************************************************/
 
-#include "convert_equation.h"
+#include "convert_equation.hpp"
 
 #include <sstream>
 
-#include "convert_expression.h"
-#include "replace_inner_product.h"
-#include "../util.h"
-#include <ast/parser/parse.h>
-#include "../../ast/ast_types.h"
-#include "../../ast/ast_builder.h"
+#include <ast/ast_builder.hpp>
+#include <ast/ast_types.hpp>
+#include <ast/parser/parse.hpp>
+#include "convert_expression.hpp"
+#include "replace_inner_product.hpp"
+#include <util/util.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/visitors/convert_equation.hpp b/src/mmoc/util/visitors/convert_equation.hpp
index 24bdb5c8..3de22776 100644
--- a/src/mmoc/util/visitors/convert_equation.hpp
+++ b/src/mmoc/util/visitors/convert_equation.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <util/ast_util.h>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/convert_expression.cpp b/src/mmoc/util/visitors/convert_expression.cpp
index 1993d511..00bd57fc 100644
--- a/src/mmoc/util/visitors/convert_expression.cpp
+++ b/src/mmoc/util/visitors/convert_expression.cpp
@@ -17,18 +17,18 @@
 
  ******************************************************************************/
 
-#include "convert_expression.h"
+#include "convert_expression.hpp"
 
 #include <sstream>
 
-#include <ast/parser/parse.h>
-#include "../../ast/ast_types.h"
-#include "../../ast/ast_builder.h"
-#include "../../ir/event.h"
-#include "../error.h"
-#include "../model_config.h"
-#include "../util.h"
-#include "../visitors/replace_constant.h"
+#include <ast/ast_builder.hpp>
+#include <ast/ast_types.hpp>
+#include <ast/parser/parse.hpp>
+#include <ir/event.hpp>
+#include "replace_constant.hpp"
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
 
 namespace MicroModelica {
 using namespace IR;
@@ -36,8 +36,7 @@ namespace Util {
 
 /* ConvertExpression Class */
 
-ConvertExpression::ConvertExpression(AST_Expression left, AST_Expression right)
-    : _left(nullptr), _right(nullptr), _convert()
+ConvertExpression::ConvertExpression(AST_Expression left, AST_Expression right) : _left(nullptr), _right(nullptr), _convert()
 {
   ReplaceConstant replace_constant;
   _left = replace_constant.apply(left);
diff --git a/src/mmoc/util/visitors/convert_expression.hpp b/src/mmoc/util/visitors/convert_expression.hpp
index e84bbfc2..b601c1a3 100644
--- a/src/mmoc/util/visitors/convert_expression.hpp
+++ b/src/mmoc/util/visitors/convert_expression.hpp
@@ -20,7 +20,7 @@
 #ifndef CONVERT_EXPRESSION_H_
 #define CONVERT_EXPRESSION_H_
 
-#include "../ast_util.h"
+#include "../ast_util.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/convert_output_range.cpp b/src/mmoc/util/visitors/convert_output_range.cpp
index e1084d19..102144b6 100644
--- a/src/mmoc/util/visitors/convert_output_range.cpp
+++ b/src/mmoc/util/visitors/convert_output_range.cpp
@@ -17,15 +17,15 @@
 
  ******************************************************************************/
 
-#include "convert_output_range.h"
+#include "convert_output_range.hpp"
 
 #include <sstream>
 
-#include "../error.h"
-#include <deps/sbg_graph/build_from_exps.h>
-#include "../model_config.h"
-#include "../util.h"
-#include "eval_init_exp.h"
+#include <deps/sbg_graph/build_from_exps.hpp>
+#include "eval_init_exp.hpp"
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/visitors/convert_output_range.hpp b/src/mmoc/util/visitors/convert_output_range.hpp
index 4eba63f4..1e0d3c73 100644
--- a/src/mmoc/util/visitors/convert_output_range.hpp
+++ b/src/mmoc/util/visitors/convert_output_range.hpp
@@ -19,10 +19,10 @@
 
 #pragma once
 
-#include <ast/ast_builder.h>
-#include <deps/sbg_graph/multi_interval.h>
-#include <ir/index.h>
-#include <util/ast_util.h>
+#include <ast/ast_builder.hpp>
+#include <deps/sbg_graph/multi_interval.hpp>
+#include <ir/index.hpp>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/convert_statement.cpp b/src/mmoc/util/visitors/convert_statement.cpp
index b9692a4d..11cac737 100644
--- a/src/mmoc/util/visitors/convert_statement.cpp
+++ b/src/mmoc/util/visitors/convert_statement.cpp
@@ -17,25 +17,22 @@
 
  ******************************************************************************/
 
-#include "convert_statement.h"
+#include "convert_statement.hpp"
 
 #include <sstream>
 
-#include <ast/parser/parse.h>
-#include "../../ast/ast_types.h"
-#include "../../ast/ast_builder.h"
-#include "../visitors/replace_constant.h"
-#include "convert_expression.h"
-#include "replace_inner_product.h"
+#include <ast/parser/parse.hpp>
+#include "../../ast/ast_types.hpp"
+#include "../../ast/ast_builder.hpp"
+#include "../visitors/replace_constant.hpp"
+#include "convert_expression.hpp"
+#include "replace_inner_product.hpp"
 
 namespace MicroModelica {
 using namespace IR;
 namespace Util {
 
-ConvertStatement::ConvertStatement(AST_Statement statement)
-{
-  _statement = convert(statement);
-}
+ConvertStatement::ConvertStatement(AST_Statement statement) { _statement = convert(statement); }
 
 AST_Statement ConvertStatement::get() { return _statement; }
 
diff --git a/src/mmoc/util/visitors/convert_statement.hpp b/src/mmoc/util/visitors/convert_statement.hpp
index 79c45dd2..2af430aa 100644
--- a/src/mmoc/util/visitors/convert_statement.hpp
+++ b/src/mmoc/util/visitors/convert_statement.hpp
@@ -20,7 +20,7 @@
 #ifndef CONVERT_STATEMENT_H_
 #define CONVERT_STATEMENT_H_
 
-#include "../ast_util.h"
+#include "../ast_util.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/discrete_assignment.cpp b/src/mmoc/util/visitors/discrete_assignment.cpp
index b80175a5..2c1f7d07 100644
--- a/src/mmoc/util/visitors/discrete_assignment.cpp
+++ b/src/mmoc/util/visitors/discrete_assignment.cpp
@@ -17,11 +17,11 @@
 
  ******************************************************************************/
 
-#include "discrete_assignment.h"
+#include "discrete_assignment.hpp"
 
-#include "../error.h"
-#include "../model_config.h"
-#include "../symbol_table.h"
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/symbol_table.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/discrete_assignment.hpp b/src/mmoc/util/visitors/discrete_assignment.hpp
index 13b7057b..54bb7803 100644
--- a/src/mmoc/util/visitors/discrete_assignment.hpp
+++ b/src/mmoc/util/visitors/discrete_assignment.hpp
@@ -20,7 +20,7 @@
 #ifndef DISCRETE_ASSIGNMENT_H_
 #define DISCRETE_ASSIGNMENT_H_
 
-#include "../ast_util.h"
+#include "../ast_util.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/eval_init_exp.cpp b/src/mmoc/util/visitors/eval_init_exp.cpp
index a14c3a1d..32658647 100644
--- a/src/mmoc/util/visitors/eval_init_exp.cpp
+++ b/src/mmoc/util/visitors/eval_init_exp.cpp
@@ -17,11 +17,11 @@
 
  ******************************************************************************/
 
-#include "eval_init_exp.h"
+#include "eval_init_exp.hpp"
 
-#include <util/error.h>
-#include <util/model_config.h>
-#include <util/symbol_table.h>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/symbol_table.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/eval_init_exp.hpp b/src/mmoc/util/visitors/eval_init_exp.hpp
index 8de29f27..051ba491 100644
--- a/src/mmoc/util/visitors/eval_init_exp.hpp
+++ b/src/mmoc/util/visitors/eval_init_exp.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <util/ast_util.h>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/expression_printer.cpp b/src/mmoc/util/visitors/expression_printer.cpp
index 7a2f2726..bc293cb7 100644
--- a/src/mmoc/util/visitors/expression_printer.cpp
+++ b/src/mmoc/util/visitors/expression_printer.cpp
@@ -17,18 +17,18 @@
 
  ******************************************************************************/
 
-#include "expression_printer.h"
+#include "expression_printer.hpp"
 
 #include <iomanip>
 #include <sstream>
 
-#include <ast/ast_builder.h>
-#include <ir/class.h>
-#include <ir/helpers.h>
-#include <util/error.h>
-#include <util/model_config.h>
-#include <util/util.h>
-#include <util/visitors/is_constant_expression.h>
+#include <ast/ast_builder.hpp>
+#include <ir/class.hpp>
+#include <ir/helpers.hpp>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/visitors/is_constant_expression.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/visitors/expression_printer.hpp b/src/mmoc/util/visitors/expression_printer.hpp
index 63bb8e07..fb45f932 100644
--- a/src/mmoc/util/visitors/expression_printer.hpp
+++ b/src/mmoc/util/visitors/expression_printer.hpp
@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include <util/ast_util.h>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/get_index_usage.cpp b/src/mmoc/util/visitors/get_index_usage.cpp
index e79360a4..f0f8f687 100644
--- a/src/mmoc/util/visitors/get_index_usage.cpp
+++ b/src/mmoc/util/visitors/get_index_usage.cpp
@@ -17,10 +17,10 @@
 
  ******************************************************************************/
 
-#include "get_index_usage.h"
+#include "get_index_usage.hpp"
 
-#include <util/error.h>
-#include <util/model_config.h>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/visitors/get_index_usage.hpp b/src/mmoc/util/visitors/get_index_usage.hpp
index 753c4019..05b954b7 100644
--- a/src/mmoc/util/visitors/get_index_usage.hpp
+++ b/src/mmoc/util/visitors/get_index_usage.hpp
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <ir/index.h>
-#include <util/ast_util.h>
+#include <ir/index.hpp>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/get_index_variables.cpp b/src/mmoc/util/visitors/get_index_variables.cpp
index 2bc1bcc4..d2f937dc 100644
--- a/src/mmoc/util/visitors/get_index_variables.cpp
+++ b/src/mmoc/util/visitors/get_index_variables.cpp
@@ -17,13 +17,13 @@
 
  ******************************************************************************/
 
-#include "get_index_variables.h"
+#include "get_index_variables.hpp"
 
 #include <sstream>
 
-#include <ast/ast_builder.h>
-#include <util/error.h>
-#include <util/model_config.h>
+#include <ast/ast_builder.hpp>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/visitors/get_index_variables.hpp b/src/mmoc/util/visitors/get_index_variables.hpp
index 6f540c0a..e214b208 100644
--- a/src/mmoc/util/visitors/get_index_variables.hpp
+++ b/src/mmoc/util/visitors/get_index_variables.hpp
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <ir/index.h>
-#include <util/ast_util.h>
+#include <ir/index.hpp>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/has_scalar_index.cpp b/src/mmoc/util/visitors/has_scalar_index.cpp
index f010986b..a610743a 100644
--- a/src/mmoc/util/visitors/has_scalar_index.cpp
+++ b/src/mmoc/util/visitors/has_scalar_index.cpp
@@ -17,9 +17,9 @@
 
  ******************************************************************************/
 
-#include "has_scalar_index.h"
+#include "has_scalar_index.hpp"
 
-#include "is_constant_index.h"
+#include "is_constant_index.hpp"
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/visitors/has_scalar_index.hpp b/src/mmoc/util/visitors/has_scalar_index.hpp
index bff70227..a72c76c4 100644
--- a/src/mmoc/util/visitors/has_scalar_index.hpp
+++ b/src/mmoc/util/visitors/has_scalar_index.hpp
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include "../../ast/ast_builder.h"
-#include "../../ir/index.h"
-#include "../ast_util.h"
+#include "../../ast/ast_builder.hpp"
+#include "../../ir/index.hpp"
+#include "../ast_util.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/is_constant_expression.cpp b/src/mmoc/util/visitors/is_constant_expression.cpp
index 4b30d443..3bdec21f 100644
--- a/src/mmoc/util/visitors/is_constant_expression.cpp
+++ b/src/mmoc/util/visitors/is_constant_expression.cpp
@@ -17,11 +17,11 @@
 
  ******************************************************************************/
 
-#include "is_constant_expression.h"
+#include "is_constant_expression.hpp"
 
-#include <util/error.h>
-#include <util/model_config.h>
-#include <util/util.h>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/visitors/is_constant_expression.hpp b/src/mmoc/util/visitors/is_constant_expression.hpp
index fe8eb78b..99090e01 100644
--- a/src/mmoc/util/visitors/is_constant_expression.hpp
+++ b/src/mmoc/util/visitors/is_constant_expression.hpp
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <ast/ast_builder.h>
-#include <util/ast_util.h>
+#include <ast/ast_builder.hpp>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/is_constant_index.cpp b/src/mmoc/util/visitors/is_constant_index.cpp
index 32ed42ea..7746bdc0 100644
--- a/src/mmoc/util/visitors/is_constant_index.cpp
+++ b/src/mmoc/util/visitors/is_constant_index.cpp
@@ -17,11 +17,11 @@
 
  ******************************************************************************/
 
-#include "is_constant_index.h"
+#include "is_constant_index.hpp"
 
-#include <util/error.h>
-#include <util/model_config.h>
-#include <util/util.h>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
 
 namespace MicroModelica {
 using namespace Deps;
diff --git a/src/mmoc/util/visitors/is_constant_index.hpp b/src/mmoc/util/visitors/is_constant_index.hpp
index 00bb7df3..533189f5 100644
--- a/src/mmoc/util/visitors/is_constant_index.hpp
+++ b/src/mmoc/util/visitors/is_constant_index.hpp
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <ast/ast_builder.h>
-#include <ir/index.h>
-#include <util/ast_util.h>
+#include <ast/ast_builder.hpp>
+#include <ir/index.hpp>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/is_recursive_def.cpp b/src/mmoc/util/visitors/is_recursive_def.cpp
index a8a3a337..d78e3820 100644
--- a/src/mmoc/util/visitors/is_recursive_def.cpp
+++ b/src/mmoc/util/visitors/is_recursive_def.cpp
@@ -17,9 +17,9 @@
 
  ******************************************************************************/
 
-#include "is_recursive_def.h"
+#include "is_recursive_def.hpp"
 
-#include "../error.h"
+#include <util/error.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/visitors/is_recursive_def.hpp b/src/mmoc/util/visitors/is_recursive_def.hpp
index 81fe8539..bb1ebf59 100644
--- a/src/mmoc/util/visitors/is_recursive_def.hpp
+++ b/src/mmoc/util/visitors/is_recursive_def.hpp
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include "../../ast/ast_builder.h"
-#include "../../ir/index.h"
-#include "../ast_util.h"
+#include "../../ast/ast_builder.hpp"
+#include "../../ir/index.hpp"
+#include "../ast_util.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/jac_alg_exps.cpp b/src/mmoc/util/visitors/jac_alg_exps.cpp
index f8f8b98d..7c7e15ac 100644
--- a/src/mmoc/util/visitors/jac_alg_exps.cpp
+++ b/src/mmoc/util/visitors/jac_alg_exps.cpp
@@ -17,16 +17,16 @@
 
  ******************************************************************************/
 
-#include "jac_alg_exps.h"
+#include "jac_alg_exps.hpp"
 
 #include <math.h>
 
-#include "../../ast/ast_builder.h"
-#include "../debug.h"
-#include "../error.h"
-#include "../symbol_table.h"
-#include "algebraics.h"
-#include "has_scalar_index.h"
+#include "algebraics.hpp"
+#include <ast/ast_builder.hpp>
+#include "has_scalar_index.hpp"
+#include <util/debug.hpp>
+#include <util/error.hpp>
+#include <util/symbol_table.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/visitors/jac_alg_exps.hpp b/src/mmoc/util/visitors/jac_alg_exps.hpp
index 2df71b22..36407ba6 100644
--- a/src/mmoc/util/visitors/jac_alg_exps.hpp
+++ b/src/mmoc/util/visitors/jac_alg_exps.hpp
@@ -20,7 +20,7 @@
 #ifndef JAC_ALG_EXPS_H_
 #define JAC_ALG_EXPS_H_
 
-#include "../ast_util.h"
+#include "../ast_util.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/occurs.cpp b/src/mmoc/util/visitors/occurs.cpp
index 927915b3..ad8c98a4 100644
--- a/src/mmoc/util/visitors/occurs.cpp
+++ b/src/mmoc/util/visitors/occurs.cpp
@@ -17,12 +17,12 @@
 
  ******************************************************************************/
 
-#include "occurs.h"
+#include "occurs.hpp"
 
-#include <util/error.h>
-#include <util/model_config.h>
-#include <util/symbol_table.h>
-#include <util/visitors/is_constant_index.h>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/symbol_table.hpp>
+#include <util/visitors/is_constant_index.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/visitors/occurs.hpp b/src/mmoc/util/visitors/occurs.hpp
index 7484d18f..7f02e860 100644
--- a/src/mmoc/util/visitors/occurs.hpp
+++ b/src/mmoc/util/visitors/occurs.hpp
@@ -19,7 +19,7 @@
 
 #pragma once 
 
-#include <util/ast_util.h>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/parse_index.cpp b/src/mmoc/util/visitors/parse_index.cpp
index a1b1df21..d49e0441 100644
--- a/src/mmoc/util/visitors/parse_index.cpp
+++ b/src/mmoc/util/visitors/parse_index.cpp
@@ -17,12 +17,12 @@
 
  ******************************************************************************/
 
-#include "parse_index.h"
+#include "parse_index.hpp"
 
-#include <util/model_config.h>
-#include "../error.h"
-#include "../util.h"
-#include "partial_eval_exp.h"
+#include <util/model_config.hpp>
+#include <util/error.hpp>
+#include <util/util.hpp>
+#include "partial_eval_exp.hpp"
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/visitors/parse_index.hpp b/src/mmoc/util/visitors/parse_index.hpp
index ce39ba1b..a836d53b 100644
--- a/src/mmoc/util/visitors/parse_index.hpp
+++ b/src/mmoc/util/visitors/parse_index.hpp
@@ -20,8 +20,8 @@
 #ifndef PARSE_INDEX_H_
 #define PARSE_INDEX_H_
 
-#include "../../ast/ast_builder.h"
-#include "../ast_util.h"
+#include "../../ast/ast_builder.hpp"
+#include "../ast_util.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/partial_eval_exp.cpp b/src/mmoc/util/visitors/partial_eval_exp.cpp
index 3607f7ef..7ec178f2 100644
--- a/src/mmoc/util/visitors/partial_eval_exp.cpp
+++ b/src/mmoc/util/visitors/partial_eval_exp.cpp
@@ -17,15 +17,15 @@
 
  ******************************************************************************/
 
-#include "partial_eval_exp.h"
+#include "partial_eval_exp.hpp"
 
 #include <math.h>
 
-#include <ast/ast_builder.h>
-#include <util/debug.h>
-#include <util/error.h>
-#include <util/model_config.h>
-#include <util/symbol_table.h>
+#include <ast/ast_builder.hpp>
+#include <util/debug.hpp>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/symbol_table.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/partial_eval_exp.hpp b/src/mmoc/util/visitors/partial_eval_exp.hpp
index f299540d..df1ab909 100644
--- a/src/mmoc/util/visitors/partial_eval_exp.hpp
+++ b/src/mmoc/util/visitors/partial_eval_exp.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <util/ast_util.h>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/partition_interval.cpp b/src/mmoc/util/visitors/partition_interval.cpp
index db520968..46a4e55f 100644
--- a/src/mmoc/util/visitors/partition_interval.cpp
+++ b/src/mmoc/util/visitors/partition_interval.cpp
@@ -17,11 +17,11 @@
 
  ******************************************************************************/
 
-#include "partition_interval.h"
+#include "partition_interval.hpp"
 
-#include <util/error.h>
-#include <util/model_config.h>
-#include <util/visitors/eval_init_exp.h>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/visitors/eval_init_exp.hpp>
 
 namespace MicroModelica {
 using namespace Deps;
diff --git a/src/mmoc/util/visitors/partition_interval.hpp b/src/mmoc/util/visitors/partition_interval.hpp
index ae7801f3..47b44ffc 100644
--- a/src/mmoc/util/visitors/partition_interval.hpp
+++ b/src/mmoc/util/visitors/partition_interval.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <util/ast_util.h>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/pwl_map_values.cpp b/src/mmoc/util/visitors/pwl_map_values.cpp
index 1a34c478..b022a6f4 100644
--- a/src/mmoc/util/visitors/pwl_map_values.cpp
+++ b/src/mmoc/util/visitors/pwl_map_values.cpp
@@ -17,14 +17,14 @@
 
  ******************************************************************************/
 
-#include "pwl_map_values.h"
-
-#include <util/error.h>
-#include <util/model_config.h>
-#include <util/symbol_table.h>
-#include <util/visitors/eval_init_exp.h>
-#include <util/visitors/is_constant_expression.h>
-#include <util/visitors/partial_eval_exp.h>
+#include "pwl_map_values.hpp"
+
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/symbol_table.hpp>
+#include <util/visitors/eval_init_exp.hpp>
+#include <util/visitors/is_constant_expression.hpp>
+#include <util/visitors/partial_eval_exp.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/pwl_map_values.hpp b/src/mmoc/util/visitors/pwl_map_values.hpp
index cf60b16c..c0683d85 100644
--- a/src/mmoc/util/visitors/pwl_map_values.hpp
+++ b/src/mmoc/util/visitors/pwl_map_values.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <util/ast_util.h>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/replace_constant.cpp b/src/mmoc/util/visitors/replace_constant.cpp
index d270b677..ab475615 100644
--- a/src/mmoc/util/visitors/replace_constant.cpp
+++ b/src/mmoc/util/visitors/replace_constant.cpp
@@ -17,12 +17,12 @@
 
  ******************************************************************************/
 
-#include "replace_constant.h"
+#include "replace_constant.hpp"
 
-#include "../error.h"
-#include "../model_config.h"
-#include "../util.h"
-#include "partial_eval_exp.h"
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include "partial_eval_exp.hpp"
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/visitors/replace_constant.hpp b/src/mmoc/util/visitors/replace_constant.hpp
index 27fd9e81..132f78e8 100644
--- a/src/mmoc/util/visitors/replace_constant.hpp
+++ b/src/mmoc/util/visitors/replace_constant.hpp
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <ast/ast_builder.h>
-#include <util/ast_util.h>
+#include <ast/ast_builder.hpp>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/replace_der.cpp b/src/mmoc/util/visitors/replace_der.cpp
index 904c8985..a4420cc2 100644
--- a/src/mmoc/util/visitors/replace_der.cpp
+++ b/src/mmoc/util/visitors/replace_der.cpp
@@ -17,13 +17,13 @@
 
  ******************************************************************************/
 
-#include "replace_der.h"
+#include "replace_der.hpp"
 
 #include <sstream>
 
-#include "../../ast/ast_builder.h"
-#include "../error.h"
-#include "../symbol_table.h"
+#include "../../ast/ast_builder.hpp"
+#include <util/error.hpp>
+#include "../symbol_table.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/replace_der.hpp b/src/mmoc/util/visitors/replace_der.hpp
index c35b9d40..5b0f4bb2 100644
--- a/src/mmoc/util/visitors/replace_der.hpp
+++ b/src/mmoc/util/visitors/replace_der.hpp
@@ -20,7 +20,7 @@
 #ifndef REPLACE_DER_H_
 #define REPLACE_DER_H_
 
-#include "../ast_util.h"
+#include "../ast_util.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/replace_index.cpp b/src/mmoc/util/visitors/replace_index.cpp
index c8b05658..f140a925 100644
--- a/src/mmoc/util/visitors/replace_index.cpp
+++ b/src/mmoc/util/visitors/replace_index.cpp
@@ -17,15 +17,15 @@
 
  ******************************************************************************/
 
-#include "replace_index.h"
+#include "replace_index.hpp"
 
 #include <sstream>
 
-#include <util/error.h>
-#include <util/model_config.h>
-#include <util/util.h>
-#include <util/visitors/get_index_usage.h>
-#include <util/visitors/get_index_variables.h>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/util.hpp>
+#include <util/visitors/get_index_usage.hpp>
+#include <util/visitors/get_index_variables.hpp>
 
 namespace MicroModelica {
 using namespace Deps;
diff --git a/src/mmoc/util/visitors/replace_index.hpp b/src/mmoc/util/visitors/replace_index.hpp
index 0ec49a57..6cb34dda 100644
--- a/src/mmoc/util/visitors/replace_index.hpp
+++ b/src/mmoc/util/visitors/replace_index.hpp
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <ast/ast_builder.h>
-#include <ir/index.h>
-#include <util/ast_util.h>
+#include <ast/ast_builder.hpp>
+#include <ir/index.hpp>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/replace_inner_product.cpp b/src/mmoc/util/visitors/replace_inner_product.cpp
index 80a9f855..7a540c92 100644
--- a/src/mmoc/util/visitors/replace_inner_product.cpp
+++ b/src/mmoc/util/visitors/replace_inner_product.cpp
@@ -17,12 +17,12 @@
 
  ******************************************************************************/
 
-#include "replace_inner_product.h"
+#include "replace_inner_product.hpp"
 
-#include "../../ast/ast_builder.h"
-#include "../error.h"
-#include "../model_config.h"
-#include "../symbol_table.h"
+#include <ast/ast_builder.hpp>
+#include <util/error.hpp>
+#include <util/model_config.hpp>
+#include <util/symbol_table.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/replace_inner_product.hpp b/src/mmoc/util/visitors/replace_inner_product.hpp
index bba3c572..a818e1b8 100644
--- a/src/mmoc/util/visitors/replace_inner_product.hpp
+++ b/src/mmoc/util/visitors/replace_inner_product.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <util/ast_util.h>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/revert_index.cpp b/src/mmoc/util/visitors/revert_index.cpp
index 5a7c1708..0ef87ad5 100644
--- a/src/mmoc/util/visitors/revert_index.cpp
+++ b/src/mmoc/util/visitors/revert_index.cpp
@@ -17,12 +17,12 @@
 
  ******************************************************************************/
 
-#include "revert_index.h"
+#include "revert_index.hpp"
 
 #include <sstream>
 
-#include "../../ast/ast_builder.h"
-#include "../error.h"
+#include "../../ast/ast_builder.hpp"
+#include <util/error.hpp>
 
 namespace MicroModelica {
 using namespace IR;
diff --git a/src/mmoc/util/visitors/revert_index.hpp b/src/mmoc/util/visitors/revert_index.hpp
index f727d574..b577ca3d 100644
--- a/src/mmoc/util/visitors/revert_index.hpp
+++ b/src/mmoc/util/visitors/revert_index.hpp
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include "../../ast/ast_builder.h"
-#include "../../ir/index.h"
-#include "../ast_util.h"
+#include "../../ast/ast_builder.hpp"
+#include "../../ir/index.hpp"
+#include "../ast_util.hpp"
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/variable_lookup.cpp b/src/mmoc/util/visitors/variable_lookup.cpp
index 38873669..7d32f924 100644
--- a/src/mmoc/util/visitors/variable_lookup.cpp
+++ b/src/mmoc/util/visitors/variable_lookup.cpp
@@ -17,9 +17,9 @@
 
  ******************************************************************************/
 
-#include <util/error.h>
-#include <util/symbol_table.h>
-#include <util/visitors/variable_lookup.h>
+#include <util/error.hpp>
+#include <util/symbol_table.hpp>
+#include <util/visitors/variable_lookup.hpp>
 
 namespace MicroModelica {
 namespace Util {
diff --git a/src/mmoc/util/visitors/variable_lookup.hpp b/src/mmoc/util/visitors/variable_lookup.hpp
index 458175e5..a8fafdb1 100644
--- a/src/mmoc/util/visitors/variable_lookup.hpp
+++ b/src/mmoc/util/visitors/variable_lookup.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <util/ast_util.h>
+#include <util/ast_util.hpp>
 
 namespace MicroModelica {
 namespace Util {