diff --git a/src/COLLOID/fix_wall_colloid.cpp b/src/COLLOID/fix_wall_colloid.cpp
index d21856bc60..3160fadb53 100644
--- a/src/COLLOID/fix_wall_colloid.cpp
+++ b/src/COLLOID/fix_wall_colloid.cpp
@@ -24,7 +24,6 @@
 #include <cmath>
 
 using namespace LAMMPS_NS;
-using namespace FixConst;
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/src/EXTRA-FIX/fix_wall_ees.cpp b/src/EXTRA-FIX/fix_wall_ees.cpp
index bbddd919af..d9bc2a8450 100644
--- a/src/EXTRA-FIX/fix_wall_ees.cpp
+++ b/src/EXTRA-FIX/fix_wall_ees.cpp
@@ -26,7 +26,6 @@
 #include <cmath>
 
 using namespace LAMMPS_NS;
-using namespace FixConst;
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/src/EXTRA-FIX/fix_wall_reflect_stochastic.cpp b/src/EXTRA-FIX/fix_wall_reflect_stochastic.cpp
index 7899c88473..c0b44530e8 100644
--- a/src/EXTRA-FIX/fix_wall_reflect_stochastic.cpp
+++ b/src/EXTRA-FIX/fix_wall_reflect_stochastic.cpp
@@ -31,7 +31,6 @@
 #include <cstring>
 
 using namespace LAMMPS_NS;
-using namespace FixConst;
 
 enum{NONE,DIFFUSIVE,MAXWELL,CCL};
 
diff --git a/src/GRANULAR/fix_wall_gran_region.cpp b/src/GRANULAR/fix_wall_gran_region.cpp
index f1bd55a7bc..68afce2b0b 100644
--- a/src/GRANULAR/fix_wall_gran_region.cpp
+++ b/src/GRANULAR/fix_wall_gran_region.cpp
@@ -29,7 +29,6 @@
 #include <cstring>
 
 using namespace LAMMPS_NS;
-using namespace FixConst;
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/src/KOKKOS/fix_wall_lj93_kokkos.cpp b/src/KOKKOS/fix_wall_lj93_kokkos.cpp
index 03bf6cf8ea..dff47f1c30 100644
--- a/src/KOKKOS/fix_wall_lj93_kokkos.cpp
+++ b/src/KOKKOS/fix_wall_lj93_kokkos.cpp
@@ -19,7 +19,6 @@
 #include "atom_masks.h"
 
 using namespace LAMMPS_NS;
-using namespace FixConst;
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/src/KOKKOS/fix_wall_reflect_kokkos.cpp b/src/KOKKOS/fix_wall_reflect_kokkos.cpp
index 32b9ee61b1..a8a01c1926 100644
--- a/src/KOKKOS/fix_wall_reflect_kokkos.cpp
+++ b/src/KOKKOS/fix_wall_reflect_kokkos.cpp
@@ -24,7 +24,6 @@
 #include <cstring>
 
 using namespace LAMMPS_NS;
-using namespace FixConst;
 
 enum{XLO=0,XHI=1,YLO=2,YHI=3,ZLO=4,ZHI=5};
 enum{NONE=0,EDGE,CONSTANT,VARIABLE};
diff --git a/src/SHOCK/fix_wall_piston.cpp b/src/SHOCK/fix_wall_piston.cpp
index 82cec907f4..cb20e2d683 100644
--- a/src/SHOCK/fix_wall_piston.cpp
+++ b/src/SHOCK/fix_wall_piston.cpp
@@ -13,17 +13,19 @@
 ------------------------------------------------------------------------- */
 
 #include "fix_wall_piston.h"
+
+#include "atom.h"
+#include "comm.h"
+#include "domain.h"
+#include "error.h"
+#include "force.h"
+#include "lattice.h"
+#include "math_const.h"
+#include "random_mars.h"
+#include "update.h"
+
 #include <cmath>
 #include <cstring>
-#include "atom.h"
-#include "domain.h"
-#include "lattice.h"
-#include "update.h"
-#include "error.h"
-#include "random_mars.h"
-#include "force.h"
-#include "comm.h"
-#include "math_const.h"
 
 using namespace LAMMPS_NS;
 using namespace FixConst;
diff --git a/src/SRD/fix_wall_srd.cpp b/src/SRD/fix_wall_srd.cpp
index ccce252e5d..d9e55a49f2 100644
--- a/src/SRD/fix_wall_srd.cpp
+++ b/src/SRD/fix_wall_srd.cpp
@@ -27,7 +27,6 @@
 #include <cstring>
 
 using namespace LAMMPS_NS;
-using namespace FixConst;
 
 enum { XLO, XHI, YLO, YHI, ZLO, ZHI };
 enum { NONE, EDGE, CONSTANT, VARIABLE };
diff --git a/src/fix_wall_harmonic.cpp b/src/fix_wall_harmonic.cpp
index a8e4127523..0e8fa22684 100644
--- a/src/fix_wall_harmonic.cpp
+++ b/src/fix_wall_harmonic.cpp
@@ -16,7 +16,6 @@
 #include "error.h"
 
 using namespace LAMMPS_NS;
-using namespace FixConst;
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/src/fix_wall_lj126.cpp b/src/fix_wall_lj126.cpp
index 78d9656e7f..f7458448be 100644
--- a/src/fix_wall_lj126.cpp
+++ b/src/fix_wall_lj126.cpp
@@ -18,7 +18,6 @@
 #include "error.h"
 
 using namespace LAMMPS_NS;
-using namespace FixConst;
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/src/fix_wall_lj93.cpp b/src/fix_wall_lj93.cpp
index 1e02b61fe1..7c4db056f9 100644
--- a/src/fix_wall_lj93.cpp
+++ b/src/fix_wall_lj93.cpp
@@ -18,7 +18,6 @@
 #include "error.h"
 
 using namespace LAMMPS_NS;
-using namespace FixConst;
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/src/fix_wall_morse.cpp b/src/fix_wall_morse.cpp
index a1427b380f..7ec3ed2ab5 100644
--- a/src/fix_wall_morse.cpp
+++ b/src/fix_wall_morse.cpp
@@ -18,7 +18,6 @@
 #include <cmath>
 
 using namespace LAMMPS_NS;
-using namespace FixConst;
 
 /* ---------------------------------------------------------------------- */