diff --git a/source/module_esolver/esolver_ks.h b/source/module_esolver/esolver_ks.h
index 61e8fd3f29..892b948276 100644
--- a/source/module_esolver/esolver_ks.h
+++ b/source/module_esolver/esolver_ks.h
@@ -5,7 +5,6 @@
 #include "module_cell/klist.h"
 #include "module_elecstate/module_charge/charge_mixing.h"
 #include "module_hamilt_general/hamilt.h"
-#include "module_psi/wavefunc.h"
 #include "module_hsolver/hsolver.h"
 #include "module_io/cal_test.h"
 #include "module_psi/psi.h"
@@ -15,8 +14,10 @@
 #else
 #include <chrono>
 #endif
+
 #include <cstring>
 #include <fstream>
+
 namespace ModuleESolver
 {
 
diff --git a/source/module_hamilt_pw/hamilt_pwdft/VNL_in_pw.cpp b/source/module_hamilt_pw/hamilt_pwdft/VNL_in_pw.cpp
index dcf70385e6..dee8205a42 100644
--- a/source/module_hamilt_pw/hamilt_pwdft/VNL_in_pw.cpp
+++ b/source/module_hamilt_pw/hamilt_pwdft/VNL_in_pw.cpp
@@ -13,7 +13,7 @@
 #include "module_base/timer.h"
 #include "module_hamilt_pw/hamilt_pwdft/global.h"
 #include "module_hamilt_pw/hamilt_pwdft/kernels/vnl_op.h"
-#include "module_psi/wavefunc.h"
+
 
 pseudopot_cell_vnl::pseudopot_cell_vnl()
 {
diff --git a/source/module_hsolver/hsolver.cpp b/source/module_hsolver/hsolver.cpp
index 5b9a6bd40e..e6cf5c8d0a 100644
--- a/source/module_hsolver/hsolver.cpp
+++ b/source/module_hsolver/hsolver.cpp
@@ -1,6 +1,7 @@
 #include "hsolver.h"
 
 #include "module_parameter/parameter.h"
+
 namespace hsolver
 {
 
diff --git a/source/module_hsolver/hsolver.h b/source/module_hsolver/hsolver.h
index 9a624d664f..770bda95f0 100644
--- a/source/module_hsolver/hsolver.h
+++ b/source/module_hsolver/hsolver.h
@@ -1,14 +1,9 @@
 #ifndef HSOLVER_H
 #define HSOLVER_H
 
-#include "module_base/macros.h"
 #include "module_elecstate/elecstate.h"
 #include "module_hamilt_general/hamilt.h"
-#include "module_psi/wavefunc.h"
-#include "module_hamilt_pw/hamilt_stodft/sto_wf.h"
-#include "module_psi/psi.h"
 
-#include <complex>
 
 namespace hsolver
 {
diff --git a/source/module_hsolver/hsolver_lcao.h b/source/module_hsolver/hsolver_lcao.h
index 10b8817f95..3c41373527 100644
--- a/source/module_hsolver/hsolver_lcao.h
+++ b/source/module_hsolver/hsolver_lcao.h
@@ -1,7 +1,8 @@
 #ifndef HSOLVERLCAO_H
 #define HSOLVERLCAO_H
 
-#include "hsolver.h"
+#include "module_elecstate/elecstate.h"
+#include "module_hamilt_general/hamilt.h"
 #include "module_basis/module_ao/parallel_orbitals.h"
 
 namespace hsolver
diff --git a/source/module_hsolver/hsolver_lcaopw.h b/source/module_hsolver/hsolver_lcaopw.h
index fd82e7b8eb..db65e966bc 100644
--- a/source/module_hsolver/hsolver_lcaopw.h
+++ b/source/module_hsolver/hsolver_lcaopw.h
@@ -1,7 +1,8 @@
 #ifndef HSOLVERLIP_H
 #define HSOLVERLIP_H
 
-#include "hsolver.h"
+#include "module_elecstate/elecstate.h"
+#include "module_hamilt_general/hamilt.h"
 #include "module_base/macros.h"
 #include "module_base/module_device/types.h"
 namespace hsolver
diff --git a/source/module_hsolver/hsolver_pw.cpp b/source/module_hsolver/hsolver_pw.cpp
index 977fc262ed..945a65f87d 100644
--- a/source/module_hsolver/hsolver_pw.cpp
+++ b/source/module_hsolver/hsolver_pw.cpp
@@ -5,7 +5,6 @@
 #include "module_base/tool_quit.h"
 #include "module_elecstate/elecstate_pw.h"
 #include "module_hamilt_general/hamilt.h"
-#include "module_psi/wavefunc.h"
 #include "module_hsolver/diag_comm_info.h"
 #include "module_hsolver/diago_bpcg.h"
 #include "module_hsolver/diago_cg.h"
diff --git a/source/module_hsolver/hsolver_pw.h b/source/module_hsolver/hsolver_pw.h
index f7724961c1..cbfa2b85d6 100644
--- a/source/module_hsolver/hsolver_pw.h
+++ b/source/module_hsolver/hsolver_pw.h
@@ -1,7 +1,8 @@
 #ifndef HSOLVERPW_H
 #define HSOLVERPW_H
 
-#include "hsolver.h"
+#include "module_elecstate/elecstate.h"
+#include "module_hamilt_general/hamilt.h"
 #include "module_base/macros.h"
 #include "module_basis/module_pw/pw_basis_k.h"
 #include "module_psi/wavefunc.h"
diff --git a/source/module_lr/esolver_lrtd_lcao.h b/source/module_lr/esolver_lrtd_lcao.h
index bc3db43e58..05e2e7507f 100644
--- a/source/module_lr/esolver_lrtd_lcao.h
+++ b/source/module_lr/esolver_lrtd_lcao.h
@@ -3,7 +3,8 @@
 #include "module_parameter/input_parameter.h"
 #include "module_cell/unitcell.h"
 #include "module_hamilt_general/hamilt.h"
-#include "module_hsolver/hsolver.h"
+#include "module_elecstate/elecstate.h"
+#include "module_hamilt_general/hamilt.h"
 #include "module_elecstate/elecstate_lcao.h"
 
 #include <vector>   //future tensor