diff --git a/include/qpp/MATLAB/matlab.hpp b/include/qpp/MATLAB/matlab.hpp
index b6769f788..100a7b674 100644
--- a/include/qpp/MATLAB/matlab.hpp
+++ b/include/qpp/MATLAB/matlab.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file MATLAB/matlab.hpp
+ * \file qpp/MATLAB/matlab.hpp
  * \brief Input/output interfacing with MATLAB
  */
 
diff --git a/include/qpp/classes/codes.hpp b/include/qpp/classes/codes.hpp
index 7bbfd5ee7..073647ca0 100644
--- a/include/qpp/classes/codes.hpp
+++ b/include/qpp/classes/codes.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/codes.hpp
+ * \file qpp/classes/codes.hpp
  * \brief Quantum error correcting codes
  */
 
diff --git a/include/qpp/classes/exception.hpp b/include/qpp/classes/exception.hpp
index 1acf73578..fc1feaca7 100644
--- a/include/qpp/classes/exception.hpp
+++ b/include/qpp/classes/exception.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/exception.hpp
+ * \file qpp/classes/exception.hpp
  * \brief Exceptions
  */
 
diff --git a/include/qpp/classes/gates.hpp b/include/qpp/classes/gates.hpp
index b1e4b2f74..01c93d5fd 100644
--- a/include/qpp/classes/gates.hpp
+++ b/include/qpp/classes/gates.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/gates.hpp
+ * \file qpp/classes/gates.hpp
  * \brief Quantum gates
  */
 
diff --git a/include/qpp/classes/idisplay.hpp b/include/qpp/classes/idisplay.hpp
index 9bba64661..4f95932c9 100644
--- a/include/qpp/classes/idisplay.hpp
+++ b/include/qpp/classes/idisplay.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/idisplay.hpp
+ * \file qpp/classes/idisplay.hpp
  * \brief Textual representation interface
  */
 
diff --git a/include/qpp/classes/ijson.hpp b/include/qpp/classes/ijson.hpp
index c1675d19d..681f388a5 100644
--- a/include/qpp/classes/ijson.hpp
+++ b/include/qpp/classes/ijson.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/ijson.hpp
+ * \file qpp/classes/ijson.hpp
  * \brief Basic JSON serialization
  */
 
diff --git a/include/qpp/classes/init.hpp b/include/qpp/classes/init.hpp
index 9a03c6063..57debfb8b 100644
--- a/include/qpp/classes/init.hpp
+++ b/include/qpp/classes/init.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/init.hpp
+ * \file qpp/classes/init.hpp
  * \brief Initialization
  */
 
diff --git a/include/qpp/classes/layouts.hpp b/include/qpp/classes/layouts.hpp
index fd5d41d26..b521d3c5d 100644
--- a/include/qpp/classes/layouts.hpp
+++ b/include/qpp/classes/layouts.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/layouts.hpp
+ * \file qpp/classes/layouts.hpp
  * \see qpp::ILayout
  * \brief Various qudit placement layouts, all must implement the interface
  * \a qpp::ILayout
diff --git a/include/qpp/classes/noise.hpp b/include/qpp/classes/noise.hpp
index 9a5d047fb..62c89ac5e 100644
--- a/include/qpp/classes/noise.hpp
+++ b/include/qpp/classes/noise.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/noise.hpp
+ * \file qpp/classes/noise.hpp
  * \brief Noise models
  */
 
diff --git a/include/qpp/classes/qbase_engine.hpp b/include/qpp/classes/qbase_engine.hpp
index d28bba296..73a4bbf69 100644
--- a/include/qpp/classes/qbase_engine.hpp
+++ b/include/qpp/classes/qbase_engine.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/qbase_engine.hpp
+ * \file qpp/classes/qbase_engine.hpp
  * \brief Base class for quantum engines
  */
 
diff --git a/include/qpp/classes/qcircuit_traits.hpp b/include/qpp/classes/qcircuit_traits.hpp
index 8b1906b8b..8914253ec 100644
--- a/include/qpp/classes/qcircuit_traits.hpp
+++ b/include/qpp/classes/qcircuit_traits.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/qcircuit_traits.hpp
+ * \file qpp/classes/qcircuit_traits.hpp
  * \brief Quantum circuit traits (compile-time)
  */
 
diff --git a/include/qpp/classes/qdummy_engine.hpp b/include/qpp/classes/qdummy_engine.hpp
index 34d726e08..c5050765f 100644
--- a/include/qpp/classes/qdummy_engine.hpp
+++ b/include/qpp/classes/qdummy_engine.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/qdummy_engine.hpp
+ * \file qpp/classes/qdummy_engine.hpp
  * \brief No-op (dummy) quantum engines
  */
 
diff --git a/include/qpp/classes/qengine.hpp b/include/qpp/classes/qengine.hpp
index f00199831..71c1fcc41 100644
--- a/include/qpp/classes/qengine.hpp
+++ b/include/qpp/classes/qengine.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/qengine.hpp
+ * \file qpp/classes/qengine.hpp
  * \brief Quantum engines
  */
 
diff --git a/include/qpp/classes/qengine_traits.hpp b/include/qpp/classes/qengine_traits.hpp
index 114e32023..303953332 100644
--- a/include/qpp/classes/qengine_traits.hpp
+++ b/include/qpp/classes/qengine_traits.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/qengine_traits.hpp
+ * \file qpp/classes/qengine_traits.hpp
  * \brief Quantum engine traits (run-time)
  */
 
diff --git a/include/qpp/classes/qnoisy_engine.hpp b/include/qpp/classes/qnoisy_engine.hpp
index 49fe545f1..8d697edb1 100644
--- a/include/qpp/classes/qnoisy_engine.hpp
+++ b/include/qpp/classes/qnoisy_engine.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/qnoisy_engine.hpp
+ * \file qpp/classes/qnoisy_engine.hpp
  * \brief Noisy quantum engines
  */
 
diff --git a/include/qpp/classes/random_devices.hpp b/include/qpp/classes/random_devices.hpp
index 4c11a6f12..8f3f14ab9 100644
--- a/include/qpp/classes/random_devices.hpp
+++ b/include/qpp/classes/random_devices.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/random_devices.hpp
+ * \file qpp/classes/random_devices.hpp
  * \brief Random devices
  */
 
diff --git a/include/qpp/classes/reversible.hpp b/include/qpp/classes/reversible.hpp
index 016098f63..4fc295f3f 100644
--- a/include/qpp/classes/reversible.hpp
+++ b/include/qpp/classes/reversible.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/reversible.hpp
+ * \file qpp/classes/reversible.hpp
  * \brief Support for classical reversible circuits
  */
 
diff --git a/include/qpp/classes/states.hpp b/include/qpp/classes/states.hpp
index 2273f4f6c..cd2f5659b 100644
--- a/include/qpp/classes/states.hpp
+++ b/include/qpp/classes/states.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/states.hpp
+ * \file qpp/classes/states.hpp
  * \brief Quantum states
  */
 
diff --git a/include/qpp/classes/timer.hpp b/include/qpp/classes/timer.hpp
index ef28ce15f..0f3d4a36d 100644
--- a/include/qpp/classes/timer.hpp
+++ b/include/qpp/classes/timer.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file classes/timer.hpp
+ * \file qpp/classes/timer.hpp
  * \brief Timing
  */
 
diff --git a/include/qpp/constants.hpp b/include/qpp/constants.hpp
index b73f2d257..80ee766a7 100644
--- a/include/qpp/constants.hpp
+++ b/include/qpp/constants.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file constants.hpp
+ * \file qpp/constants.hpp
  * \brief Constants
  */
 
diff --git a/include/qpp/entanglement.hpp b/include/qpp/entanglement.hpp
index dc68abdf3..2402fd346 100644
--- a/include/qpp/entanglement.hpp
+++ b/include/qpp/entanglement.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file entanglement.hpp
+ * \file qpp/entanglement.hpp
  * \brief Entanglement functions
  */
 
diff --git a/include/qpp/entropies.hpp b/include/qpp/entropies.hpp
index 764449eed..9071a217b 100644
--- a/include/qpp/entropies.hpp
+++ b/include/qpp/entropies.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file entropies.hpp
+ * \file qpp/entropies.hpp
  * \brief Entropy functions
  */
 
diff --git a/include/qpp/experimental/experimental.hpp b/include/qpp/experimental/experimental.hpp
index f94d50619..6ec4f0cee 100644
--- a/include/qpp/experimental/experimental.hpp
+++ b/include/qpp/experimental/experimental.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file experimental/experimental.hpp
+ * \file qpp/experimental/experimental.hpp
  * \brief Experimental/test functions/classes
  */
 
@@ -195,7 +195,7 @@ measure_seq(const Eigen::MatrixBase<Derived>& A, std::vector<idx> target,
 #endif // QPP_OPENMP
                 { out_state += current_ket; }
             } // end if(overlap_ket)
-        }     // end for
+        } // end for
         realT norm_out_state = norm(out_state);
         prob = norm_out_state * norm_out_state;
         out_state = out_state / norm_out_state;
@@ -249,9 +249,9 @@ measure_seq(const Eigen::MatrixBase<Derived>& A, std::vector<idx> target,
 #endif // QPP_OPENMP
                         { out_state += cA(i, j) * current_ket * current_bra; }
                     } // end if(overlap_bra)
-                }     // end for(all bras)
-            }         // end if(overlap_ket)
-        }             // end for(all kets)
+                } // end for(all bras)
+            } // end if(overlap_ket)
+        } // end for(all kets)
         prob = trace(out_state).real();
         out_state = out_state / prob;
     } // end else(density matrix)
diff --git a/include/qpp/functions.hpp b/include/qpp/functions.hpp
index 15f87454a..638ef4aae 100644
--- a/include/qpp/functions.hpp
+++ b/include/qpp/functions.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file functions.hpp
+ * \file qpp/functions.hpp
  * \brief Generic quantum computing functions
  */
 
diff --git a/include/qpp/input_output.hpp b/include/qpp/input_output.hpp
index 74d7e6265..f1206934d 100644
--- a/include/qpp/input_output.hpp
+++ b/include/qpp/input_output.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file input_output.hpp
+ * \file qpp/input_output.hpp
  * \brief Input/output functions
  */
 
diff --git a/include/qpp/instruments.hpp b/include/qpp/instruments.hpp
index c1373245a..48012a2c7 100644
--- a/include/qpp/instruments.hpp
+++ b/include/qpp/instruments.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file instruments.hpp
+ * \file qpp/instruments.hpp
  * \brief Measurement functions
  */
 
diff --git a/include/qpp/internal/classes/iomanip.hpp b/include/qpp/internal/classes/iomanip.hpp
index ca4040812..4c404d915 100644
--- a/include/qpp/internal/classes/iomanip.hpp
+++ b/include/qpp/internal/classes/iomanip.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file internal/classes/iomanip.hpp
+ * \file qpp/internal/classes/iomanip.hpp
  * \brief Input/output manipulators
  */
 
diff --git a/include/qpp/internal/classes/singleton.hpp b/include/qpp/internal/classes/singleton.hpp
index e370966c2..da77f74a0 100644
--- a/include/qpp/internal/classes/singleton.hpp
+++ b/include/qpp/internal/classes/singleton.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file internal/classes/singleton.hpp
+ * \file qpp/internal/classes/singleton.hpp
  * \brief Singleton pattern via CRTP
  */
 
diff --git a/include/qpp/internal/util.hpp b/include/qpp/internal/util.hpp
index d1fd1a372..2c830ea7f 100644
--- a/include/qpp/internal/util.hpp
+++ b/include/qpp/internal/util.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file internal/util.hpp
+ * \file qpp/internal/util.hpp
  * \brief Internal utility functions
  */
 
diff --git a/include/qpp/number_theory.hpp b/include/qpp/number_theory.hpp
index 9faa74cb0..f27099795 100644
--- a/include/qpp/number_theory.hpp
+++ b/include/qpp/number_theory.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file number_theory.hpp
+ * \file qpp/number_theory.hpp
  * \brief Number theory functions
  */
 
diff --git a/include/qpp/operations.hpp b/include/qpp/operations.hpp
index 73e4155b8..7d8c413c0 100644
--- a/include/qpp/operations.hpp
+++ b/include/qpp/operations.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file operations.hpp
+ * \file qpp/operations.hpp
  * \brief Quantum operation functions
  */
 
diff --git a/include/qpp/options.hpp b/include/qpp/options.hpp
index 2ac49079b..7e902413f 100644
--- a/include/qpp/options.hpp
+++ b/include/qpp/options.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file options.hpp
+ * \file qpp/options.hpp
  * \brief Options
  */
 
diff --git a/include/qpp/qasm/qasm.hpp b/include/qpp/qasm/qasm.hpp
index 99ea70695..1298964d6 100644
--- a/include/qpp/qasm/qasm.hpp
+++ b/include/qpp/qasm/qasm.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file qasm/qasm.hpp
+ * \file qpp/qasm/qasm.hpp
  * \brief OpenQASM to QCircuit interface
  */
 
diff --git a/include/qpp/qpp.h b/include/qpp/qpp.h
index ffa3b1351..4478b264a 100644
--- a/include/qpp/qpp.h
+++ b/include/qpp/qpp.h
@@ -32,7 +32,7 @@
 // ALWAYS include it in main.cpp
 
 /**
- * \file qpp.h
+ * \file qpp/qpp.h
  * \brief Quantum++ main header file, includes all other required headers
  */
 
diff --git a/include/qpp/random.hpp b/include/qpp/random.hpp
index 71ca3f4ae..8b0ea3d85 100644
--- a/include/qpp/random.hpp
+++ b/include/qpp/random.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file random.hpp
+ * \file qpp/random.hpp
  * \brief Randomness-related functions
  */
 
diff --git a/include/qpp/statistics.hpp b/include/qpp/statistics.hpp
index 8326d8f2a..6739db6fd 100644
--- a/include/qpp/statistics.hpp
+++ b/include/qpp/statistics.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file statistics.hpp
+ * \file qpp/statistics.hpp
  * \brief Statistics functions
  */
 
diff --git a/include/qpp/traits.hpp b/include/qpp/traits.hpp
index b0493b0a6..4e17f4fb2 100644
--- a/include/qpp/traits.hpp
+++ b/include/qpp/traits.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file traits.hpp
+ * \file qpp/traits.hpp
  * \brief Type traits
  */
 
diff --git a/include/qpp/types.hpp b/include/qpp/types.hpp
index 91c671cfe..d678b448e 100644
--- a/include/qpp/types.hpp
+++ b/include/qpp/types.hpp
@@ -25,7 +25,7 @@
  */
 
 /**
- * \file types.hpp
+ * \file qpp/types.hpp
  * \brief Type aliases
  */