diff --git a/src/DIPOLE/atom_vec_dipole.cpp b/src/DIPOLE/atom_vec_dipole.cpp
index 945732f74b..a3ff3fd0f5 100644
--- a/src/DIPOLE/atom_vec_dipole.cpp
+++ b/src/DIPOLE/atom_vec_dipole.cpp
@@ -13,11 +13,9 @@
 
 #include "atom_vec_dipole.h"
 #include <cmath>
-#include <cstdlib>
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "memory.h"
diff --git a/src/KOKKOS/atom_vec_angle_kokkos.cpp b/src/KOKKOS/atom_vec_angle_kokkos.cpp
index b8f5634fa0..736e1c1fca 100644
--- a/src/KOKKOS/atom_vec_angle_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_angle_kokkos.cpp
@@ -12,11 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_angle_kokkos.h"
-#include <cstdlib>
 #include "atom_kokkos.h"
 #include "comm_kokkos.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "atom_masks.h"
diff --git a/src/KOKKOS/atom_vec_atomic_kokkos.cpp b/src/KOKKOS/atom_vec_atomic_kokkos.cpp
index f65f34419a..4fec5740d6 100644
--- a/src/KOKKOS/atom_vec_atomic_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_atomic_kokkos.cpp
@@ -12,11 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_atomic_kokkos.h"
-#include <cstdlib>
 #include "atom_kokkos.h"
 #include "comm_kokkos.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "atom_masks.h"
diff --git a/src/KOKKOS/atom_vec_bond_kokkos.cpp b/src/KOKKOS/atom_vec_bond_kokkos.cpp
index c36b084637..74c05a506c 100644
--- a/src/KOKKOS/atom_vec_bond_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_bond_kokkos.cpp
@@ -12,11 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_bond_kokkos.h"
-#include <cstdlib>
 #include "atom_kokkos.h"
 #include "comm_kokkos.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "atom_masks.h"
diff --git a/src/KOKKOS/atom_vec_charge_kokkos.cpp b/src/KOKKOS/atom_vec_charge_kokkos.cpp
index 631c4b237c..3f26b1e9ea 100644
--- a/src/KOKKOS/atom_vec_charge_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_charge_kokkos.cpp
@@ -12,11 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_charge_kokkos.h"
-#include <cstdlib>
 #include "atom_kokkos.h"
 #include "comm_kokkos.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "atom_masks.h"
diff --git a/src/KOKKOS/atom_vec_dpd_kokkos.cpp b/src/KOKKOS/atom_vec_dpd_kokkos.cpp
index e7123037ca..4162b71374 100644
--- a/src/KOKKOS/atom_vec_dpd_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_dpd_kokkos.cpp
@@ -12,11 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_dpd_kokkos.h"
-#include <cstdlib>
 #include "atom_kokkos.h"
 #include "comm_kokkos.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "atom_masks.h"
diff --git a/src/KOKKOS/atom_vec_full_kokkos.cpp b/src/KOKKOS/atom_vec_full_kokkos.cpp
index 4b6e413b64..1fdbcbec8c 100644
--- a/src/KOKKOS/atom_vec_full_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_full_kokkos.cpp
@@ -12,11 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_full_kokkos.h"
-#include <cstdlib>
 #include "atom_kokkos.h"
 #include "comm_kokkos.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "atom_masks.h"
diff --git a/src/KOKKOS/atom_vec_hybrid_kokkos.cpp b/src/KOKKOS/atom_vec_hybrid_kokkos.cpp
index 630648b3a6..318e79d955 100644
--- a/src/KOKKOS/atom_vec_hybrid_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_hybrid_kokkos.cpp
@@ -12,11 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_hybrid_kokkos.h"
-#include <cstdlib>
 #include <cstring>
 #include "atom_kokkos.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "memory_kokkos.h"
diff --git a/src/KOKKOS/atom_vec_molecular_kokkos.cpp b/src/KOKKOS/atom_vec_molecular_kokkos.cpp
index 8790f0bdbc..f3b4ae98ca 100644
--- a/src/KOKKOS/atom_vec_molecular_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_molecular_kokkos.cpp
@@ -12,13 +12,11 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_molecular_kokkos.h"
-#include <cstdlib>
 #include "atom_kokkos.h"
 #include "comm_kokkos.h"
 #include "domain.h"
 #include "modify.h"
 #include "fix.h"
-#include "force.h"
 #include "atom_masks.h"
 #include "memory_kokkos.h"
 #include "error.h"
diff --git a/src/KOKKOS/atom_vec_sphere_kokkos.cpp b/src/KOKKOS/atom_vec_sphere_kokkos.cpp
index 0f69cc9c5a..d93b98a4b0 100644
--- a/src/KOKKOS/atom_vec_sphere_kokkos.cpp
+++ b/src/KOKKOS/atom_vec_sphere_kokkos.cpp
@@ -13,14 +13,12 @@
 
 #include "atom_vec_sphere_kokkos.h"
 #include <cmath>
-#include <cstdlib>
 #include <cstring>
 #include "atom_kokkos.h"
 #include "atom_masks.h"
 #include "comm_kokkos.h"
 #include "domain.h"
 #include "modify.h"
-#include "force.h"
 #include "fix.h"
 #include "fix_adapt.h"
 #include "math_const.h"
diff --git a/src/MOLECULE/atom_vec_angle.cpp b/src/MOLECULE/atom_vec_angle.cpp
index c8053266ca..b6f5a013cb 100644
--- a/src/MOLECULE/atom_vec_angle.cpp
+++ b/src/MOLECULE/atom_vec_angle.cpp
@@ -12,11 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_angle.h"
-#include <cstdlib>
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "memory.h"
diff --git a/src/MOLECULE/atom_vec_bond.cpp b/src/MOLECULE/atom_vec_bond.cpp
index 0d267d10cc..b9d4177b4f 100644
--- a/src/MOLECULE/atom_vec_bond.cpp
+++ b/src/MOLECULE/atom_vec_bond.cpp
@@ -12,11 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_bond.h"
-#include <cstdlib>
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "memory.h"
diff --git a/src/MOLECULE/atom_vec_full.cpp b/src/MOLECULE/atom_vec_full.cpp
index 167edde18f..e71e23a661 100644
--- a/src/MOLECULE/atom_vec_full.cpp
+++ b/src/MOLECULE/atom_vec_full.cpp
@@ -12,11 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_full.h"
-#include <cstdlib>
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "memory.h"
diff --git a/src/MOLECULE/atom_vec_molecular.cpp b/src/MOLECULE/atom_vec_molecular.cpp
index 5ccf5529b4..1bafb6dc43 100644
--- a/src/MOLECULE/atom_vec_molecular.cpp
+++ b/src/MOLECULE/atom_vec_molecular.cpp
@@ -12,11 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_molecular.h"
-#include <cstdlib>
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "memory.h"
diff --git a/src/MOLECULE/atom_vec_template.cpp b/src/MOLECULE/atom_vec_template.cpp
index ae31870fd0..27c6ab4183 100644
--- a/src/MOLECULE/atom_vec_template.cpp
+++ b/src/MOLECULE/atom_vec_template.cpp
@@ -12,10 +12,8 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_template.h"
-#include <cstdlib>
 #include "atom.h"
 #include "molecule.h"
-#include "force.h"
 #include "comm.h"
 #include "domain.h"
 #include "modify.h"
diff --git a/src/PERI/atom_vec_peri.cpp b/src/PERI/atom_vec_peri.cpp
index 0829dfb1c0..47b88995b8 100644
--- a/src/PERI/atom_vec_peri.cpp
+++ b/src/PERI/atom_vec_peri.cpp
@@ -17,12 +17,10 @@
 
 #include "atom_vec_peri.h"
 #include <cfloat>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "citeme.h"
diff --git a/src/SPIN/atom_vec_spin.cpp b/src/SPIN/atom_vec_spin.cpp
index 345a2d6c04..f5560b6ee9 100644
--- a/src/SPIN/atom_vec_spin.cpp
+++ b/src/SPIN/atom_vec_spin.cpp
@@ -25,14 +25,12 @@
 
 #include "atom_vec_spin.h"
 #include <cmath>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
 #include "error.h"
 #include "fix.h"
-#include "force.h"
 #include "memory.h"
 #include "modify.h"
 #include "utils.h"
diff --git a/src/USER-AWPMD/atom_vec_wavepacket.cpp b/src/USER-AWPMD/atom_vec_wavepacket.cpp
index bafd172254..c12798688e 100644
--- a/src/USER-AWPMD/atom_vec_wavepacket.cpp
+++ b/src/USER-AWPMD/atom_vec_wavepacket.cpp
@@ -17,13 +17,11 @@
 
 #include "atom_vec_wavepacket.h"
 #include <cmath>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
 #include "modify.h"
-#include "force.h"
 #include "fix.h"
 #include "memory.h"
 #include "error.h"
diff --git a/src/USER-DPD/atom_vec_dpd.cpp b/src/USER-DPD/atom_vec_dpd.cpp
index 2aef55ff9f..bf11840d1e 100644
--- a/src/USER-DPD/atom_vec_dpd.cpp
+++ b/src/USER-DPD/atom_vec_dpd.cpp
@@ -15,12 +15,10 @@
    Contributing author: James Larentzos (U.S. Army Research Laboratory)
 ------------------------------------------------------------------------- */
 
-#include <cstdlib>
 #include "atom_vec_dpd.h"
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "memory.h"
diff --git a/src/USER-EFF/atom_vec_electron.cpp b/src/USER-EFF/atom_vec_electron.cpp
index cca71545f4..707a75c7c1 100644
--- a/src/USER-EFF/atom_vec_electron.cpp
+++ b/src/USER-EFF/atom_vec_electron.cpp
@@ -15,9 +15,8 @@
    Contributing author: Andres Jaramillo-Botero (Caltech)
 ------------------------------------------------------------------------- */
 
-#include <cstdlib>
-#include <cstring>
 #include "atom_vec_electron.h"
+#include <cstring>
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
diff --git a/src/USER-MESO/atom_vec_edpd.cpp b/src/USER-MESO/atom_vec_edpd.cpp
index ff8515abc6..dccc8b9efa 100644
--- a/src/USER-MESO/atom_vec_edpd.cpp
+++ b/src/USER-MESO/atom_vec_edpd.cpp
@@ -10,13 +10,11 @@
 
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
-#include <cstring>
-#include <cstdlib>
 #include "atom_vec_edpd.h"
+#include <cstring>
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "update.h"
diff --git a/src/USER-MESO/atom_vec_mdpd.cpp b/src/USER-MESO/atom_vec_mdpd.cpp
index 965891a283..0aa6aedcee 100644
--- a/src/USER-MESO/atom_vec_mdpd.cpp
+++ b/src/USER-MESO/atom_vec_mdpd.cpp
@@ -11,13 +11,11 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <cstring>
-#include <cstdlib>
 #include "atom_vec_mdpd.h"
+#include <cstring>
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "update.h"
diff --git a/src/USER-MESO/atom_vec_tdpd.cpp b/src/USER-MESO/atom_vec_tdpd.cpp
index f19758f884..278baa2024 100644
--- a/src/USER-MESO/atom_vec_tdpd.cpp
+++ b/src/USER-MESO/atom_vec_tdpd.cpp
@@ -11,12 +11,10 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
-#include <cstring>
-#include <cstdlib>
 #include "atom_vec_tdpd.h"
+#include <cstring>
 #include "atom.h"
 #include "comm.h"
-#include "force.h"
 #include "domain.h"
 #include "modify.h"
 #include "fix.h"
@@ -65,7 +63,7 @@ void AtomVecTDPD::process_args(int narg, char **arg)
 {
   if (narg < 1) error->all(FLERR,"Invalid atom_style tdpd command");
 
-  atom->cc_species = force->inumeric(FLERR,arg[0]);
+  atom->cc_species = utils::inumeric(FLERR,arg[0],false,lmp);
   cc_species = atom->cc_species;
 
   // reset sizes that depend on cc_species
@@ -801,7 +799,7 @@ void AtomVecTDPD::data_atom(double *coord, imageint imagetmp, char **values)
   x[nlocal][2] = coord[2];
 
   for(int k = 0; k < cc_species; k++)
-    cc[nlocal][k] = atof( values[5+k] );
+    cc[nlocal][k] = utils::numeric(FLERR,values[5+k],true,lmp);
 
   image[nlocal] = imagetmp;
 
diff --git a/src/USER-SMD/atom_vec_smd.cpp b/src/USER-SMD/atom_vec_smd.cpp
index 278652bf43..5cc411a832 100644
--- a/src/USER-SMD/atom_vec_smd.cpp
+++ b/src/USER-SMD/atom_vec_smd.cpp
@@ -22,15 +22,13 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <cmath>
-#include <cstdlib>
-#include <cstring>
 #include "atom_vec_smd.h"
+#include <cmath>
+#include <cstring>
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
 #include "modify.h"
-#include "force.h"
 #include "fix.h"
 #include "fix_adapt.h"
 #include "math_const.h"
diff --git a/src/USER-SPH/atom_vec_meso.cpp b/src/USER-SPH/atom_vec_meso.cpp
index 0960141ae2..59e6638f16 100644
--- a/src/USER-SPH/atom_vec_meso.cpp
+++ b/src/USER-SPH/atom_vec_meso.cpp
@@ -11,13 +11,11 @@
  See the README file in the top-level LAMMPS directory.
  ------------------------------------------------------------------------- */
 
-#include <cstring>
-#include <cstdlib>
 #include "atom_vec_meso.h"
+#include <cstring>
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "memory.h"
diff --git a/src/atom_vec.cpp b/src/atom_vec.cpp
index 146a503221..1ea085b869 100644
--- a/src/atom_vec.cpp
+++ b/src/atom_vec.cpp
@@ -13,7 +13,6 @@
 
 #include "atom_vec.h"
 #include <cstring>
-#include <cstdlib>
 #include "atom.h"
 #include "force.h"
 #include "domain.h"
diff --git a/src/atom_vec_atomic.cpp b/src/atom_vec_atomic.cpp
index f1583ab8cc..3cf037f182 100644
--- a/src/atom_vec_atomic.cpp
+++ b/src/atom_vec_atomic.cpp
@@ -12,11 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_atomic.h"
-#include <cstdlib>
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "memory.h"
diff --git a/src/atom_vec_body.cpp b/src/atom_vec_body.cpp
index 622b698bd9..53ed708c4e 100644
--- a/src/atom_vec_body.cpp
+++ b/src/atom_vec_body.cpp
@@ -12,7 +12,6 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_body.h"
-#include <cstdlib>
 #include <cstring>
 #include <string>
 #include "my_pool_chunk.h"
diff --git a/src/atom_vec_charge.cpp b/src/atom_vec_charge.cpp
index da863f0949..923d892acd 100644
--- a/src/atom_vec_charge.cpp
+++ b/src/atom_vec_charge.cpp
@@ -12,11 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_charge.h"
-#include <cstdlib>
 #include "atom.h"
 #include "comm.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "memory.h"
diff --git a/src/atom_vec_ellipsoid.cpp b/src/atom_vec_ellipsoid.cpp
index 44cd818c9d..586e6a80ff 100644
--- a/src/atom_vec_ellipsoid.cpp
+++ b/src/atom_vec_ellipsoid.cpp
@@ -16,7 +16,6 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_ellipsoid.h"
-#include <cstdlib>
 #include <cstring>
 #include "math_extra.h"
 #include "atom.h"
diff --git a/src/atom_vec_hybrid.cpp b/src/atom_vec_hybrid.cpp
index 25c85b2e3d..9ad07b9032 100644
--- a/src/atom_vec_hybrid.cpp
+++ b/src/atom_vec_hybrid.cpp
@@ -12,11 +12,9 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_hybrid.h"
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
 #include "domain.h"
-#include "force.h"
 #include "modify.h"
 #include "fix.h"
 #include "memory.h"
diff --git a/src/atom_vec_line.cpp b/src/atom_vec_line.cpp
index f9feb9b046..30736c02c9 100644
--- a/src/atom_vec_line.cpp
+++ b/src/atom_vec_line.cpp
@@ -13,7 +13,6 @@
 
 #include "atom_vec_line.h"
 #include <cmath>
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
 #include "comm.h"
diff --git a/src/atom_vec_sphere.cpp b/src/atom_vec_sphere.cpp
index 1defcf8d01..9d52d005ba 100644
--- a/src/atom_vec_sphere.cpp
+++ b/src/atom_vec_sphere.cpp
@@ -12,7 +12,6 @@
 ------------------------------------------------------------------------- */
 
 #include "atom_vec_sphere.h"
-#include <cstdlib>
 #include <cstring>
 #include "atom.h"
 #include "comm.h"
diff --git a/src/atom_vec_tri.cpp b/src/atom_vec_tri.cpp
index 8835255591..640e0fcb34 100644
--- a/src/atom_vec_tri.cpp
+++ b/src/atom_vec_tri.cpp
@@ -13,7 +13,6 @@
 
 #include "atom_vec_tri.h"
 #include <cmath>
-#include <cstdlib>
 #include <cstring>
 #include "math_extra.h"
 #include "atom.h"