diff --git a/src/cluster/cluster.cpp b/src/cluster/cluster.cpp
index d37fff9703b01a3e62da0ffef6824e778d4747e8..559375ff615f95dbcf7f352662fe691a88c587fe 100644
--- a/src/cluster/cluster.cpp
+++ b/src/cluster/cluster.cpp
@@ -1,10 +1,23 @@
+/*! \file cluster.cpp
+ */
 #include <cstdio>
 #include <fstream>
 #include <string>
 #include <complex>
+
 #ifndef INCLUDE_CONFIGURATION_H_
+#include <exception>
 #include "../include/Configuration.h"
 #endif
+
+#ifndef INCLUDE_COMMONS_H_
+#include "../include/Commons.h"
+#endif
+
+#ifndef INCLUDE_SPH_SUBS_H_
+#include "../include/sph_subs.h"
+#endif
+
 #ifndef INCLUDE_CLU_SUBS_H_
 #include "../include/clu_subs.h"
 #endif
diff --git a/src/cluster/np_cluster.cpp b/src/cluster/np_cluster.cpp
index e9a85e79d16d82e359654456a5d0345396c08fa0..0af2b80f8bd8c3514084f30dc77b6fa38c49e909 100644
--- a/src/cluster/np_cluster.cpp
+++ b/src/cluster/np_cluster.cpp
@@ -2,7 +2,9 @@
  */
 
 #include <cstdio>
+#include <complex>
 #include <string>
+
 #ifndef INCLUDE_CONFIGURATION_H_
 #include "../include/Configuration.h"
 #endif
diff --git a/src/include/Commons.h b/src/include/Commons.h
index 7a45deafdbc46ab08d11b59443d241d4bd19f22b..6ad2a0110e6eb4ebae592402e9df43e9cb182687 100644
--- a/src/include/Commons.h
+++ b/src/include/Commons.h
@@ -14,10 +14,8 @@
  *
  */
 
-#ifndef INCLUDE_COMMONS_
-#define INCLUDE_COMMONS_
-
-#include <complex>
+#ifndef INCLUDE_COMMONS_H_
+#define INCLUDE_COMMONS_H_
 
 /*! \brief Representation of the FORTRAN C1 common blocks.
  *
diff --git a/src/include/Configuration.h b/src/include/Configuration.h
index c23ac6924cf3595fef13f4e72f76c5e85aaddd87..a4cf7f44997597569f958abc34455f7288c11807 100644
--- a/src/include/Configuration.h
+++ b/src/include/Configuration.h
@@ -4,10 +4,6 @@
 #ifndef INCLUDE_CONFIGURATION_H_
 #define INCLUDE_CONFIGURATION_H_
 
-#include <complex>
-#include <exception>
-#include <string>
-
 /**
  * \brief Exception for open file error handlers.
  */
diff --git a/src/include/List.h b/src/include/List.h
index 98fa3b12e96fe607d4945379f033f3fdf19b6b07..0f9ebeab42e3e2e52d434e854420d061cd0c1d3a 100644
--- a/src/include/List.h
+++ b/src/include/List.h
@@ -4,9 +4,6 @@
 #ifndef INCLUDE_LIST_H_
 #define INCLUDE_LIST_H_
 
-#include <exception>
-#include <string>
-
 /**
  * \brief Exception for out of bounds List requests.
  */
diff --git a/src/include/clu_subs.h b/src/include/clu_subs.h
index 9351e6eabaf81dc463d4697587d633ed770a2b03..9bc2f72a9c50808d78d9f035fac89cf22446f217 100644
--- a/src/include/clu_subs.h
+++ b/src/include/clu_subs.h
@@ -12,19 +12,9 @@
  * output arguments passed by reference.
  */
 
-#ifndef INCLUDE_COMMONS_H_
-#include "Commons.h"
-#endif
-
-#ifndef INCLUDE_SPH_SUBS_H_
-#include "../include/sph_subs.h"
-#endif
-
 #ifndef INCLUDE_CLU_SUBS_H_
 #define INCLUDE_CLU_SUBS_H_
 
-#include <complex>
-
 /*! \brief C++ porting of APC
  *
  * \param zpv: `double ****`
diff --git a/src/include/sph_subs.h b/src/include/sph_subs.h
index e698cfdb19c37408e90543f7bde9969e9461af15..8adc50d077947531c3bcbadb1f01b8854de1176f 100644
--- a/src/include/sph_subs.h
+++ b/src/include/sph_subs.h
@@ -11,15 +11,9 @@
  * output arguments passed by reference.
  */
 
-#ifndef INCLUDE_COMMONS_H_
-#include "Commons.h"
-#endif
-
 #ifndef INCLUDE_SPH_SUBS_H_
 #define INCLUDE_SPH_SUBS_H_
 
-#include <complex>
-
 /*! \brief Compute the asymmetry-corrected scattering cross-section.
  *
  * This function computes the product between the geometrical asymmetry parameter and
diff --git a/src/include/tra_subs.h b/src/include/tra_subs.h
index 1478812e9b7394c4c92adab4d9057dd054012616..33d9781bed4c081c8ee34e2e7d322034f6148350 100644
--- a/src/include/tra_subs.h
+++ b/src/include/tra_subs.h
@@ -16,14 +16,6 @@
 #define INCLUDE_TRA_SUBS_H_
 #endif
 
-#ifndef INCLUDE_SPH_SUBS_H_
-#include "../include/sph_subs.h"
-#endif
-
-#include <fstream>
-#include <cmath>
-#include <complex>
-
 // Structures for TRAPPING
 /*! \brief CIL data structure.
  *
diff --git a/src/libnptm/Commons.cpp b/src/libnptm/Commons.cpp
index 6717bac3a03d13b933ff57bcbe46cfc9ae85fd3a..8031eaad68f3127546b222eb3d0e62bff6f5e0be 100644
--- a/src/libnptm/Commons.cpp
+++ b/src/libnptm/Commons.cpp
@@ -10,6 +10,7 @@
  *	to the configuration objects. These, on their turn, need to
  *	expose methods to access the relevant data in read-only mode.
  */
+#include <complex>
 
 #ifndef INCLUDE_COMMONS_H
 #include "../include/Commons.h"
diff --git a/src/libnptm/Configuration.cpp b/src/libnptm/Configuration.cpp
index 9dff8f8fbcbe730852cb8e4423e411b315c26e48..125243672570b1cf51545a429608737326a6ced0 100644
--- a/src/libnptm/Configuration.cpp
+++ b/src/libnptm/Configuration.cpp
@@ -2,13 +2,23 @@
  */
 
 #include <cmath>
+#include <complex>
 #include <cstdio>
 #include <fstream>
 #include <regex>
 #include <string>
+
+#ifndef INCLUDE_LIST_H_
 #include "../include/List.h"
+#endif
+
+#ifndef INCLUDE_PARSERS_H_
 #include "../include/Parsers.h"
+#endif
+
+#ifndef INCLUDE_CONFIGURATION_H_
 #include "../include/Configuration.h"
+#endif
 
 using namespace std;
 
diff --git a/src/libnptm/clu_subs.cpp b/src/libnptm/clu_subs.cpp
index b1fb2d3def86e8f7aff84b6dadd1bc3b3c7c6a89..b516e576ce250e6259d33e7b8141c1efb19270dd 100644
--- a/src/libnptm/clu_subs.cpp
+++ b/src/libnptm/clu_subs.cpp
@@ -2,8 +2,19 @@
  *
  * \brief C++ implementation of CLUSTER subroutines.
  */
+#include <complex>
 
+#ifndef INCLUDE_COMMONS_H_
+#include "../include/Commons.h"
+#endif
+
+#ifndef INCLUDE_SPH_SUBS_H_
+#include "../include/sph_subs.h"
+#endif
+
+#ifndef INCLUDE_CLU_SUBS_H_
 #include "../include/clu_subs.h"
+#endif
 
 using namespace std;
 
diff --git a/src/libnptm/sph_subs.cpp b/src/libnptm/sph_subs.cpp
index 02c2d5a929c6f97852826a8da6bf094244d52f41..99aa4d7f25981421648ca34267e322db332c59aa 100644
--- a/src/libnptm/sph_subs.cpp
+++ b/src/libnptm/sph_subs.cpp
@@ -2,8 +2,15 @@
  *
  * \brief C++ implementation of SPHERE subroutines.
  */
+#include <complex>
 
+#ifndef INCLUDE_COMMONS_H_
+#include "../include/Commons.h"
+#endif
+
+#ifndef INCLUDE_SPH_SUBS_H_
 #include "../include/sph_subs.h"
+#endif
 
 using namespace std;
 
diff --git a/src/libnptm/tra_subs.cpp b/src/libnptm/tra_subs.cpp
index 73d3809866fa8541e1f2720d95b1bdabf8891a6f..13a5aa9ab809515a982e0b7dd03a43a9ae328f43 100644
--- a/src/libnptm/tra_subs.cpp
+++ b/src/libnptm/tra_subs.cpp
@@ -2,8 +2,21 @@
  *
  * \brief C++ implementation of TRAPPING subroutines.
  */
+#include <cmath>
+#include <complex>
+#include <fstream>
 
+#ifndef INCLUDE_COMMONS_H_
+#include "../include/Commons.h"
+#endif
+
+#ifndef INCLUDE_SPH_SUBS_H_
+#include "../include/sph_subs.h"
+#endif
+
+#ifndef INCLUDE_TRA_SUBS_H_
 #include "../include/tra_subs.h"
+#endif
 
 using namespace std;
 
diff --git a/src/sphere/np_sphere.cpp b/src/sphere/np_sphere.cpp
index 9449ace4a2b93bb8ee75f7b5fb1b4e758f436508..1846b36973859d1a175d2ff7f579ed1de064b6fe 100644
--- a/src/sphere/np_sphere.cpp
+++ b/src/sphere/np_sphere.cpp
@@ -1,8 +1,9 @@
 /*! \file np_sphere.cpp
  */
-
+#include <complex>
 #include <cstdio>
 #include <string>
+
 #ifndef INCLUDE_CONFIGURATION_H_
 #include "../include/Configuration.h"
 #endif
diff --git a/src/sphere/sphere.cpp b/src/sphere/sphere.cpp
index 4c4892f9a79528b43ee409313805f30e97a616f7..897643be76b9eff88a70d19444f9091a2e8e55c4 100644
--- a/src/sphere/sphere.cpp
+++ b/src/sphere/sphere.cpp
@@ -1,10 +1,18 @@
+/*! \file sphere.cpp
+ */
 #include <cstdio>
 #include <fstream>
 #include <string>
 #include <complex>
+
 #ifndef INCLUDE_CONFIGURATION_H_
 #include "../include/Configuration.h"
 #endif
+
+#ifndef INCLUDE_COMMONS_H_
+#include "../include/Commons.h"
+#endif
+
 #ifndef INCLUDE_SPH_SUBS_H_
 #include "../include/sph_subs.h"
 #endif
diff --git a/src/trapping/frfme.cpp b/src/trapping/frfme.cpp
index c0084283158bab19fdbbf6f303098828d23b3556..bf5ab5aa91959075b5cfa783f305e3bb6f1923df 100644
--- a/src/trapping/frfme.cpp
+++ b/src/trapping/frfme.cpp
@@ -1,17 +1,23 @@
 /*! \file frfme.cpp
- *
- * \brief C++ implementation of FRFME.
  */
-
+#include <complex>
 #include <cstdio>
+#include <fstream>
 #include <regex>
 #include <string>
+
 #ifndef INCLUDE_PARSERS_H_
 #include "../include/Parsers.h"
 #endif
-//#ifndef INCLUDE_SPH_SUBS_H_
-//#include "../include/sph_subs.h"
-//#endif
+
+#ifndef INCLUDE_COMMONS_H_
+#include "../include/Commons.h"
+#endif
+
+#ifndef INCLUDE_SPH_SUBS_H_
+#include "../include/sph_subs.h"
+#endif
+
 #ifndef INCLUDE_TRA_SUBS_H_
 #include "../include/tra_subs.h"
 #endif
diff --git a/src/trapping/lffft.cpp b/src/trapping/lffft.cpp
index 20bb1aeb100acdbfea400fd5a3a97e09fb8fee1e..98bfd19c6b0b55121f59c8e21dafd1893fc1637a 100644
--- a/src/trapping/lffft.cpp
+++ b/src/trapping/lffft.cpp
@@ -1,21 +1,30 @@
+/*! \file lffft.cpp
+ */
+#include <complex>
 #include <cstdio>
 #include <fstream>
 #include <regex>
 #include <string>
-#include <complex>
+
 #ifndef INCLUDE_PARSERS_H_
 #include "../include/Parsers.h"
 #endif
-//#ifndef INCLUDE_SPH_SUBS_H_
-//#include "../include/sph_subs.h"
-//#endif
+
+#ifndef INCLUDE_COMMONS_H_
+#include "../include/Commons.h"
+#endif
+
+#ifndef INCLUDE_SPH_SUBS_H_
+#include "../include/sph_subs.h"
+#endif
+
 #ifndef INCLUDE_TRA_SUBS_H_
 #include "../include/tra_subs.h"
 #endif
 
 using namespace std;
 
-/*! \brief C++ implementation of FRFME
+/*! \brief C++ implementation of LFFFT
  *
  *  \param data_file: `string` Name of the input data file.
  *  \param output_path: `string` Directory to write the output files in.