diff --git a/src/cluster/cluster.cpp b/src/cluster/cluster.cpp
index 1f2fb9be4e9c4aa166d50215e3d60b319a60056f..7d41b25e7d0b9e40b48e25818d6ff9b982616213 100644
--- a/src/cluster/cluster.cpp
+++ b/src/cluster/cluster.cpp
@@ -13,17 +13,6 @@
 #include "../include/types.h"
 #endif
 
-#ifdef USE_LAPACK
-#ifdef USE_MKL
-#include <mkl_lapacke.h>
-#else
-#include <lapacke.h>
-#endif
-#ifndef INCLUDE_LAPACK_CALLS_H_
-#include "../include/lapack_calls.h"
-#endif
-#endif
-
 #ifndef INCLUDE_ERRORS_H_
 #include "../include/errors.h"
 #endif
diff --git a/src/include/algebraic.h b/src/include/algebraic.h
index 01437ac9d3f21d49610ae6921421e5933ebefc42..efd13cf77de5c430060b1f0c248f637839983150 100644
--- a/src/include/algebraic.h
+++ b/src/include/algebraic.h
@@ -12,23 +12,9 @@
  * legacy serial function implementation is used as a fall-back.
  */
 
-#ifdef USE_LAPACK
-#ifdef USE_MKL
-#include <mkl_lapacke.h>
-#else
-#include <lapacke.h>
-#endif
-#else
-#define lapack_int int64_t
-#endif
-
 #ifndef INCLUDE_ALGEBRAIC_H_
 #define INCLUDE_ALGEBRAIC_H_
 
-#ifndef np_int
-#define np_int lapack_int
-#endif
-
 /*! \brief Perform in-place matrix inversion.
  *
  * \param mat: `complex double **` The matrix to be inverted (must be a square matrix).
diff --git a/src/include/clu_subs.h b/src/include/clu_subs.h
index 6852a46906998e878b0021dc5d606ac8500e8322..2e57fa71c3a55c7cffbd68a68b7bec5ccaa15b8e 100644
--- a/src/include/clu_subs.h
+++ b/src/include/clu_subs.h
@@ -17,14 +17,6 @@
 #ifndef INCLUDE_CLU_SUBS_H_
 #define INCLUDE_CLU_SUBS_H_
 
-#ifndef np_int
-#ifndef lapack_int
-#define np_int int64_t
-#else
-#define np_int lapack_int
-#endif
-#endif
-
 /*! \brief Compute the asymmetry-corrected scattering cross-section of a cluster.
  *
  * This function computes the product between the geometrical asymmetry parameter and
diff --git a/src/include/types.h b/src/include/types.h
index 0271769a73600adc8de3ff6dfe1cf4d9d0f8a49f..6eda961a429ebaa1a149ebb700cdea2d5ef69e4e 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -12,6 +12,22 @@
 
 typedef __complex__ double dcomplex;
 
+#ifdef USE_LAPACK
+#ifdef USE_MKL
+#include <mkl_lapacke.h>
+#else
+#include <lapacke.h>
+#endif
+#endif
+
+#ifndef np_int
+#ifdef lapack_int
+#define np_int lapack_int
+#else
+#define np_int int64_t
+#endif
+#endif
+
 /*! \brief Get the real part of a complex number.
  *
  * \param z: `complex double` The argument of the function.
diff --git a/src/libnptm/algebraic.cpp b/src/libnptm/algebraic.cpp
index 48335792275ba7097b29f5b639fe828bbd1aa8d2..8811abca884727176dc5c76439004ddc1b27f69e 100644
--- a/src/libnptm/algebraic.cpp
+++ b/src/libnptm/algebraic.cpp
@@ -9,11 +9,6 @@
 #endif
 
 #ifdef USE_LAPACK
-#ifdef USE_MKL
-#include <mkl_lapacke.h>
-#else
-#include <lapacke.h>
-#endif
 #ifndef INCLUDE_LAPACK_CALLS_H_
 #include "../include/lapack_calls.h"
 #endif