diff --git a/MathLib/LinAlg/MatrixVectorTraits.cpp b/MathLib/LinAlg/MatrixVectorTraits.cpp
index 2cdd4d74e1c16d122ccc071f44424ba8cc1ac55f..2ea58fb7851949ddfb00e2cf04560deb41a88430 100644
--- a/MathLib/LinAlg/MatrixVectorTraits.cpp
+++ b/MathLib/LinAlg/MatrixVectorTraits.cpp
@@ -7,8 +7,8 @@
  *
  */
 
-#include "LocalToGlobalIndexMap.h"
-#include "MatrixProviderUser.h"
+#include "NumLib/DOF/LocalToGlobalIndexMap.h"
+#include "NumLib/DOF/MatrixProviderUser.h"
 #include "MatrixVectorTraits.h"
 
 #ifdef OGS_USE_EIGEN
diff --git a/NumLib/DOF/SimpleMatrixVectorProvider-impl.h b/NumLib/DOF/SimpleMatrixVectorProvider-impl.h
index aa7d09b989c8e1328419c6ef00389585411b65d8..f35879c2027f712282f32a8549cabd357a1da6b6 100644
--- a/NumLib/DOF/SimpleMatrixVectorProvider-impl.h
+++ b/NumLib/DOF/SimpleMatrixVectorProvider-impl.h
@@ -11,7 +11,7 @@
 #include <logog/include/logog.hpp>
 
 #include "MathLib/LinAlg/BLAS.h"
-#include "MatrixVectorTraits.h"
+#include "MathLib/LinAlg/MatrixVectorTraits.h"
 #include "SimpleMatrixVectorProvider.h"
 
 namespace detail
diff --git a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator-impl.h b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator-impl.h
index c8c35472679456a133338d3d011ef9e534e102f8..9215984c16f18c4b77dea9e879bdc4287b16537b 100644
--- a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator-impl.h
+++ b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator-impl.h
@@ -14,7 +14,7 @@
 
 #include "MathLib/LinAlg/BLAS.h"
 #include "NumLib/Assembler/SerialExecutor.h"
-#include "NumLib/DOF/MatrixVectorTraits.h"
+#include "MathLib/LinAlg/MatrixVectorTraits.h"
 #include "NumLib/Function/Interpolation.h"
 #include "LocalLinearLeastSquaresExtrapolator.h"
 
diff --git a/NumLib/ODESolver/ODESystem.h b/NumLib/ODESolver/ODESystem.h
index 697e198dc1f5cc44db78f130de0474c42605d6d9..eae54d20ba2e903cdd083e65661e885545f0119a 100644
--- a/NumLib/ODESolver/ODESystem.h
+++ b/NumLib/ODESolver/ODESystem.h
@@ -11,7 +11,7 @@
 #define NUMLIB_ODESYSTEM_H
 
 #include "NumLib/IndexValueVector.h"
-#include "NumLib/DOF/MatrixVectorTraits.h"
+#include "MathLib/LinAlg/MatrixVectorTraits.h"
 
 #include "Types.h"
 #include "EquationSystem.h"
diff --git a/NumLib/ODESolver/TimeDiscretizedODESystem.h b/NumLib/ODESolver/TimeDiscretizedODESystem.h
index da9b2e81af28c9979ecb53babed226ef7f7b3881..2fccfcd2580790833e635c32f40ad784106de2d3 100644
--- a/NumLib/ODESolver/TimeDiscretizedODESystem.h
+++ b/NumLib/ODESolver/TimeDiscretizedODESystem.h
@@ -13,8 +13,8 @@
 #include <memory>
 
 #include "MathLib/LinAlg/ApplyKnownSolution.h"
+#include "MathLib/LinAlg/UnifiedMatrixSetters.h"
 #include "NumLib/IndexValueVector.h"
-#include "NumLib/DOF/UnifiedMatrixSetters.h"
 
 #include "ODESystem.h"
 #include "NonlinearSystem.h"
diff --git a/Tests/NumLib/ODEs.h b/Tests/NumLib/ODEs.h
index bb3c642e6f985e0e8b6485c5acd23bdfbd272a29..b693bf6efdbefa6aa5f65dae1bdd477fa83d8cb6 100644
--- a/Tests/NumLib/ODEs.h
+++ b/Tests/NumLib/ODEs.h
@@ -10,8 +10,8 @@
 #ifndef TESTS_NUMLIB_ODES_H
 #define TESTS_NUMLIB_ODES_H
 
-#include "NumLib/DOF/UnifiedMatrixSetters.h"
 #include "MathLib/LinAlg/BLAS.h"
+#include "MathLib/LinAlg/UnifiedMatrixSetters.h"
 #include "NumLib/ODESolver/ODESystem.h"
 
 // debug
diff --git a/Tests/NumLib/TestExtrapolation.cpp b/Tests/NumLib/TestExtrapolation.cpp
index c573d4e70c42a836f4e4676fdc253f96944e4bc5..c7afac39d8f0d4cdfcb3795fddcd29a09a592ad9 100644
--- a/Tests/NumLib/TestExtrapolation.cpp
+++ b/Tests/NumLib/TestExtrapolation.cpp
@@ -11,8 +11,8 @@
 #include <gtest/gtest.h>
 
 #include "NumLib/DOF/MatrixProviderUser.h"
-#include "NumLib/DOF/MatrixVectorTraits.h"
-#include "NumLib/DOF/UnifiedMatrixSetters.h"
+#include "MathLib/LinAlg/MatrixVectorTraits.h"
+#include "MathLib/LinAlg/UnifiedMatrixSetters.h"
 #include "NumLib/Assembler/VectorMatrixAssembler.h"
 
 #include "MathLib/LinAlg/BLAS.h"