diff --git a/.gitignore b/.gitignore
index 268c6f690..6f15a4cb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ ipch/
 obj/
 CMakeFiles/
 # The build Dir
+build/
 build//CMakeLists.txt
 /*.vcxproj
 /*.filters
diff --git a/src/exceptions/WrongFileFormatException.h b/src/exceptions/WrongFileFormatException.h
index 11dafe38b..13cb53b2d 100644
--- a/src/exceptions/WrongFileFormatException.h
+++ b/src/exceptions/WrongFileFormatException.h
@@ -5,8 +5,8 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef MRMC_EXCEPTIONS_WRONGFILEFORMAT_H_
-#define MRMC_EXCEPTIONS_WRONGFILEFORMAT_H_
+#ifndef MRMC_EXCEPTIONS_WRONGFILEFORMATEXCEPTION_H_
+#define MRMC_EXCEPTIONS_WRONGFILEFORMATEXCEPTION_H_
 
 #include <exception>
 
@@ -32,4 +32,4 @@ class WrongFileFormatException : public std::exception {
 
 } //namespace mrmc
 
-#endif /* MRMC_EXCEPTIONS_WRONGFILEFORMAT_H_ */
+#endif /* MRMC_EXCEPTIONS_WRONGFILEFORMATEXCEPTION_H_ */
diff --git a/src/formula/AP.h b/src/formula/AP.h
index 990365ff0..05f200c2c 100644
--- a/src/formula/AP.h
+++ b/src/formula/AP.h
@@ -5,8 +5,8 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef AP_H_
-#define AP_H_
+#ifndef MRMC_FORMULA_AP_H_
+#define MRMC_FORMULA_AP_H_
 
 #include "PCTLStateFormula.h"
 
@@ -89,4 +89,4 @@ private:
 
 } //namespace mrmc
 
-#endif /* AP_H_ */
+#endif /* MRMC_FORMULA_AP_H_ */
diff --git a/src/formula/And.h b/src/formula/And.h
index 7a42193b8..910e23e8f 100644
--- a/src/formula/And.h
+++ b/src/formula/And.h
@@ -5,8 +5,8 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef AND_H_
-#define AND_H_
+#ifndef MRMC_FORMULA_AND_H_
+#define MRMC_FORMULA_AND_H_
 
 #include "PCTLStateFormula.h"
 #include <string>
@@ -154,4 +154,4 @@ private:
 
 } //namespace mrmc
 
-#endif /* AND_H_ */
+#endif /* MRMC_FORMULA_AND_H_ */
diff --git a/src/formula/BoundedUntil.h b/src/formula/BoundedUntil.h
index 51131602d..edc447375 100644
--- a/src/formula/BoundedUntil.h
+++ b/src/formula/BoundedUntil.h
@@ -5,8 +5,8 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef BOUNDEDUNTIL_H_
-#define BOUNDEDUNTIL_H_
+#ifndef MRMC_FORMULA_BOUNDEDUNTIL_H_
+#define MRMC_FORMULA_BOUNDEDUNTIL_H_
 
 #include "PCTLPathFormula.h"
 #include "PCTLStateFormula.h"
@@ -180,4 +180,4 @@ private:
 
 } //namespace mrmc
 
-#endif /* BOUNDEDUNTIL_H_ */
+#endif /* MRMC_FORMULA_BOUNDEDUNTIL_H_ */
diff --git a/src/formula/Formulas.h b/src/formula/Formulas.h
index 5b8b4bffc..cd2370a24 100644
--- a/src/formula/Formulas.h
+++ b/src/formula/Formulas.h
@@ -5,8 +5,8 @@
  *      Author: chris
  */
 
-#ifndef FORMULAS_H_
-#define FORMULAS_H_
+#ifndef MRMC_FORMULA_FORMULAS_H_
+#define MRMC_FORMULA_FORMULAS_H_
 
 #include "And.h"
 #include "AP.h"
@@ -22,4 +22,4 @@
 #include "ProbabilisticIntervalOperator.h"
 #include "Until.h"
 
-#endif /* FORMULAS_H_ */
+#endif /* MRMC_FORMULA_FORMULAS_H_ */
diff --git a/src/formula/Next.h b/src/formula/Next.h
index 2eb00be05..3ffa8451d 100644
--- a/src/formula/Next.h
+++ b/src/formula/Next.h
@@ -5,8 +5,8 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef NEXT_H_
-#define NEXT_H_
+#ifndef MRMC_FORMULA_NEXT_H_
+#define MRMC_FORMULA_NEXT_H_
 
 #include "PCTLPathFormula.h"
 #include "PCTLStateFormula.h"
@@ -124,4 +124,4 @@ private:
 
 } //namespace mrmc
 
-#endif /* NEXT_H_ */
+#endif /* MRMC_FORMULA_NEXT_H_ */
diff --git a/src/formula/Not.h b/src/formula/Not.h
index 574d287a1..b4afb7d72 100644
--- a/src/formula/Not.h
+++ b/src/formula/Not.h
@@ -5,8 +5,8 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef NOT_H_
-#define NOT_H_
+#ifndef MRMC_FORMULA_NOT_H_
+#define MRMC_FORMULA_NOT_H_
 
 #include "PCTLStateFormula.h"
 
@@ -117,4 +117,4 @@ private:
 
 } //namespace MRMC
 
-#endif /* NOT_H_ */
+#endif /* MRMC_FORMULA_NOT_H_ */
diff --git a/src/formula/Or.h b/src/formula/Or.h
index 5a60d9770..110ee5228 100644
--- a/src/formula/Or.h
+++ b/src/formula/Or.h
@@ -5,8 +5,8 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef OR_H_
-#define OR_H_
+#ifndef MRMC_FORMULA_OR_H_
+#define MRMC_FORMULA_OR_H_
 
 #include "PCTLStateFormula.h"
 
@@ -153,4 +153,4 @@ private:
 
 } //namespace mrmc
 
-#endif /* OR_H_ */
+#endif /* MRMC_FORMULA_OR_H_ */
diff --git a/src/formula/PCTLPathFormula.h b/src/formula/PCTLPathFormula.h
index a70a35f53..c8230f621 100644
--- a/src/formula/PCTLPathFormula.h
+++ b/src/formula/PCTLPathFormula.h
@@ -5,8 +5,8 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef PCTLPATHFORMULA_H_
-#define PCTLPATHFORMULA_H_
+#ifndef MRMC_FORMULA_PCTLPATHFORMULA_H_
+#define MRMC_FORMULA_PCTLPATHFORMULA_H_
 
 #include "PCTLformula.h"
 #include "modelChecker/DtmcPrctlModelChecker.h"
@@ -62,4 +62,4 @@ public:
 
 } //namespace mrmc
 
-#endif /* PCTLPATHFORMULA_H_ */
+#endif /* MRMC_FORMULA_PCTLPATHFORMULA_H_ */
diff --git a/src/formula/PCTLStateFormula.h b/src/formula/PCTLStateFormula.h
index a8ca831c3..c9ed0b5fe 100644
--- a/src/formula/PCTLStateFormula.h
+++ b/src/formula/PCTLStateFormula.h
@@ -5,8 +5,8 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef PCTLSTATEFORMULA_H_
-#define PCTLSTATEFORMULA_H_
+#ifndef MRMC_FORMULA_PCTLSTATEFORMULA_H_
+#define MRMC_FORMULA_PCTLSTATEFORMULA_H_
 
 #include "PCTLformula.h"
 #include "storage/BitVector.h"
@@ -63,4 +63,4 @@ public:
 } //namespace mrmc
 
 
-#endif /* PCTLSTATEFORMULA_H_ */
+#endif /* MRMC_FORMULA_PCTLSTATEFORMULA_H_ */
diff --git a/src/formula/PCTLformula.h b/src/formula/PCTLformula.h
index add5c5198..26c805b3e 100644
--- a/src/formula/PCTLformula.h
+++ b/src/formula/PCTLformula.h
@@ -5,8 +5,8 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef PCTLFORMULA_H_
-#define PCTLFORMULA_H_
+#ifndef MRMC_FORMULA_PCTLFORMULA_H_
+#define MRMC_FORMULA_PCTLFORMULA_H_
 
 #include <string>
 
@@ -45,4 +45,4 @@ public:
 
 } //namespace mrmc
 
-#endif /* PCTLFORMULA_H_ */
+#endif /* MRMC_FORMULA_PCTLFORMULA_H_ */
diff --git a/src/formula/ProbabilisticIntervalOperator.h b/src/formula/ProbabilisticIntervalOperator.h
index 8bd86d393..6fe054366 100644
--- a/src/formula/ProbabilisticIntervalOperator.h
+++ b/src/formula/ProbabilisticIntervalOperator.h
@@ -5,8 +5,8 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef PROBABILISTICINTERVALOPERATOR_H_
-#define PROBABILISTICINTERVALOPERATOR_H_
+#ifndef MRMC_FORMULA_PROBABILISTICINTERVALOPERATOR_H_
+#define MRMC_FORMULA_PROBABILISTICINTERVALOPERATOR_H_
 
 #include "PCTLStateFormula.h"
 #include "PCTLPathFormula.h"
@@ -173,4 +173,4 @@ private:
 
 } //namespace mrmc
 
-#endif /* PROBABILISTICINTERVALOPERATOR_H_ */
+#endif /* MRMC_FORMULA_PROBABILISTICINTERVALOPERATOR_H_ */
diff --git a/src/formula/ProbabilisticNoBoundsOperator.h b/src/formula/ProbabilisticNoBoundsOperator.h
index 09a2fc4c3..0082fe33f 100644
--- a/src/formula/ProbabilisticNoBoundsOperator.h
+++ b/src/formula/ProbabilisticNoBoundsOperator.h
@@ -5,8 +5,8 @@
  *      Author: thomas
  */
 
-#ifndef PROBABILISTICNOBOUNDSOPERATOR_H_
-#define PROBABILISTICNOBOUNDSOPERATOR_H_
+#ifndef MRMC_FORMULA_PROBABILISTICNOBOUNDSOPERATOR_H_
+#define MRMC_FORMULA_PROBABILISTICNOBOUNDSOPERATOR_H_
 
 #include "PCTLformula.h"
 #include "PCTLPathFormula.h"
@@ -97,4 +97,5 @@ private:
 
 } /* namespace formula */
 } /* namespace mrmc */
-#endif /* PROBABILISTICNOBOUNDSOPERATOR_H_ */
+
+#endif /* MRMC_FORMULA_PROBABILISTICNOBOUNDSOPERATOR_H_ */
diff --git a/src/formula/ProbabilisticOperator.h b/src/formula/ProbabilisticOperator.h
index cbceee0d4..8905e030d 100644
--- a/src/formula/ProbabilisticOperator.h
+++ b/src/formula/ProbabilisticOperator.h
@@ -5,8 +5,8 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef PROBABILISTICOPERATOR_H_
-#define PROBABILISTICOPERATOR_H_
+#ifndef MRMC_FORMULA_PROBABILISTICOPERATOR_H_
+#define MRMC_FORMULA_PROBABILISTICOPERATOR_H_
 
 #include "PCTLStateFormula.h"
 
@@ -153,4 +153,5 @@ private:
 
 } /* namespace formula */
 } /* namespace mrmc */
-#endif /* PROBABILISTICOPERATOR_H_ */
+
+#endif /* MRMC_FORMULA_PROBABILISTICOPERATOR_H_ */
diff --git a/src/formula/Until.h b/src/formula/Until.h
index 1b492e68b..fb0b67f47 100644
--- a/src/formula/Until.h
+++ b/src/formula/Until.h
@@ -5,8 +5,8 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef UNTIL_H_
-#define UNTIL_H_
+#ifndef MRMC_FORMULA_UNTIL_H_
+#define MRMC_FORMULA_UNTIL_H_
 
 #include "PCTLPathFormula.h"
 #include "PCTLStateFormula.h"
@@ -153,4 +153,4 @@ private:
 
 } //namespace mrmc
 
-#endif /* UNTIL_H_ */
+#endif /* MRMC_FORMULA_UNTIL_H_ */
diff --git a/src/modelChecker/DtmcPrctlModelChecker.h b/src/modelChecker/DtmcPrctlModelChecker.h
index 76aa00531..984655aa9 100644
--- a/src/modelChecker/DtmcPrctlModelChecker.h
+++ b/src/modelChecker/DtmcPrctlModelChecker.h
@@ -5,8 +5,8 @@
  *      Author: Thomas Heinemann
  */
 
-#ifndef DTMCPRCTLMODELCHECKER_H_
-#define DTMCPRCTLMODELCHECKER_H_
+#ifndef MRMC_MODELCHECKER_DTMCPRCTLMODELCHECKER_H_
+#define MRMC_MODELCHECKER_DTMCPRCTLMODELCHECKER_H_
 
 namespace mrmc {
 
@@ -262,4 +262,4 @@ private:
 
 } //namespace mrmc
 
-#endif /* DTMCPRCTLMODELCHECKER_H_ */
+#endif /* MRMC_MODELCHECKER_DTMCPRCTLMODELCHECKER_H_ */
diff --git a/src/modelChecker/EigenDtmcPrctlModelChecker.h b/src/modelChecker/EigenDtmcPrctlModelChecker.h
index a11efe4ae..9a1760292 100644
--- a/src/modelChecker/EigenDtmcPrctlModelChecker.h
+++ b/src/modelChecker/EigenDtmcPrctlModelChecker.h
@@ -5,8 +5,8 @@
  *      Author: 
  */
 
-#ifndef EIGENDTMCPRCTLMODELCHECKER_H_
-#define EIGENDTMCPRCTLMODELCHECKER_H_
+#ifndef MRMC_MODELCHECKER_EIGENDTMCPRCTLMODELCHECKER_H_
+#define MRMC_MODELCHECKER_EIGENDTMCPRCTLMODELCHECKER_H_
 
 #include "src/utility/Vector.h"
 
@@ -226,4 +226,4 @@ public:
 
 } //namespace mrmc
 
-#endif /* EIGENDTMCPRCTLMODELCHECKER_H_ */
+#endif /* MRMC_MODELCHECKER_EIGENDTMCPRCTLMODELCHECKER_H_ */
diff --git a/src/modelChecker/GmmxxDtmcPrctlModelChecker.h b/src/modelChecker/GmmxxDtmcPrctlModelChecker.h
index 1ebcfb574..5dde36fc4 100644
--- a/src/modelChecker/GmmxxDtmcPrctlModelChecker.h
+++ b/src/modelChecker/GmmxxDtmcPrctlModelChecker.h
@@ -5,8 +5,8 @@
  *      Author: Christian Dehnert
  */
 
-#ifndef GMMXXDTMCPRCTLMODELCHECKER_H_
-#define GMMXXDTMCPRCTLMODELCHECKER_H_
+#ifndef MRMC_MODELCHECKER_GMMXXDTMCPRCTLMODELCHECKER_H_
+#define MRMC_MODELCHECKER_GMMXXDTMCPRCTLMODELCHECKER_H_
 
 #include <cmath>
 
@@ -269,4 +269,4 @@ public:
 
 } //namespace mrmc
 
-#endif /* GMMXXDTMCPRCTLMODELCHECKER_H_ */
+#endif /* MRMC_MODELCHECKER_GMMXXDTMCPRCTLMODELCHECKER_H_ */
diff --git a/src/models/AtomicPropositionsLabeling.h b/src/models/AtomicPropositionsLabeling.h
index a35fd693a..d7632445f 100644
--- a/src/models/AtomicPropositionsLabeling.h
+++ b/src/models/AtomicPropositionsLabeling.h
@@ -1,12 +1,12 @@
 /*
- * labeling.h
+ * AtomicPropositionsLabeling.h
  *
  *  Created on: 10.09.2012
  *      Author: Thomas Heinemann
  */
 
-#ifndef MRMC_MODELS_ATOMIC_PROPOSITIONS_LABELING_H_
-#define MRMC_MODELS_ATOMIC_PROPOSITIONS_LABELING_H_
+#ifndef MRMC_MODELS_ATOMICPROPOSITIONSLABELING_H_
+#define MRMC_MODELS_ATOMICPROPOSITIONSLABELING_H_
 
 #include "src/storage/BitVector.h"
 #include "src/exceptions/OutOfRangeException.h"
@@ -231,4 +231,4 @@ private:
 
 } // namespace mrmc
 
-#endif /* MRMC_MODELS_ATOMIC_PROPOSITIONS_LABELING_H_ */
+#endif /* MRMC_MODELS_ATOMICPROPOSITIONSLABELING_H_ */
diff --git a/src/models/Dtmc.h b/src/models/Dtmc.h
index 8fa263f54..dc871e143 100644
--- a/src/models/Dtmc.h
+++ b/src/models/Dtmc.h
@@ -1,12 +1,12 @@
 /*
- * dtmc.h
+ * Dtmc.h
  *
  *  Created on: 14.11.2012
  *      Author: Christian Dehnert
  */
 
-#ifndef DTMC_H_
-#define DTMC_H_
+#ifndef MRMC_MODELS_DTMC_H_
+#define MRMC_MODELS_DTMC_H_
 
 #include <ostream>
 #include <memory>
@@ -155,4 +155,4 @@ private:
 
 } // namespace mrmc
 
-#endif /* DTMC_H_ */
+#endif /* MRMC_MODELS_DTMC_H_ */
diff --git a/src/models/GraphTransitions.h b/src/models/GraphTransitions.h
index 4563bfc59..6d45bad88 100644
--- a/src/models/GraphTransitions.h
+++ b/src/models/GraphTransitions.h
@@ -1,12 +1,12 @@
 /*
- * backward_transitions.h
+ * GraphTransitions.h
  *
  *  Created on: 17.11.2012
  *      Author: Christian Dehnert
  */
 
-#ifndef GRAPHTRANSITIONS_H_
-#define BACKWARDTRANSITIONS_H_
+#ifndef MRMC_MODELS_GRAPHTRANSITIONS_H_
+#define MRMC_MODELS_GRAPHTRANSITIONS_H_
 
 #include "src/storage/SquareSparseMatrix.h"
 
@@ -175,4 +175,4 @@ private:
 
 } // namespace mrmc
 
-#endif /* GRAPHTRANSITIONS_H_ */
+#endif /* MRMC_MODELS_GRAPHTRANSITIONS_H_ */
diff --git a/src/solver/GraphAnalyzer.h b/src/solver/GraphAnalyzer.h
index e1f062798..6660ad2f9 100644
--- a/src/solver/GraphAnalyzer.h
+++ b/src/solver/GraphAnalyzer.h
@@ -5,8 +5,8 @@
  *      Author: Christian Dehnert
  */
 
-#ifndef GRAPHANALYZER_H_
-#define GRAPHANALYZER_H_
+#ifndef MRMC_SOLVER_GRAPHANALYZER_H_
+#define MRMC_SOLVER_GRAPHANALYZER_H_
 
 #include "src/models/Dtmc.h"
 #include "src/exceptions/InvalidArgumentException.h"
@@ -127,4 +127,4 @@ public:
 
 } // namespace mrmc
 
-#endif /* GRAPHANALYZER_H_ */
+#endif /* MRMC_SOLVER_GRAPHANALYZER_H_ */
diff --git a/src/storage/BitVector.h b/src/storage/BitVector.h
index 7610a85a1..041272daf 100644
--- a/src/storage/BitVector.h
+++ b/src/storage/BitVector.h
@@ -1,5 +1,5 @@
-#ifndef MRMC_VECTOR_BITVECTOR_H_
-#define MRMC_VECTOR_BITVECTOR_H_
+#ifndef MRMC_STORAGE_BITVECTOR_H_
+#define MRMC_STORAGE_BITVECTOR_H_
 
 #include <exception>
 #include <new>
@@ -544,4 +544,4 @@ private:
 
 } // namespace mrmc
 
-#endif // MRMC_SPARSE_STATIC_SPARSE_MATRIX_H_
+#endif // MRMC_STORAGE_BITVECTOR_H_
diff --git a/src/utility/OsDetection.h b/src/utility/OsDetection.h
index a88e8354c..6cda4c781 100644
--- a/src/utility/OsDetection.h
+++ b/src/utility/OsDetection.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef MRMC_UTILITY_OSDETECTION_H_
+#define MRMC_UTILITY_OSDETECTION_H_
 
 #if defined __linux__ || defined __linux
 #	define LINUX
@@ -13,3 +14,5 @@
 #else
 #	error Could not detect Operating System
 #endif
+
+#endif // MRMC_UTILITY_OSDETECTION_H_
\ No newline at end of file