diff --git a/unittest/formats/test_atom_styles.cpp b/unittest/formats/test_atom_styles.cpp
index a409f3547c..80ee3926c8 100644
--- a/unittest/formats/test_atom_styles.cpp
+++ b/unittest/formats/test_atom_styles.cpp
@@ -28,6 +28,7 @@
 #include <cmath>
 #include <cstdio>
 #include <cstring>
+#include <vector>
 #include <mpi.h>
 
 #if !defined(_FORTIFY_SOURCE) || (_FORTIFY_SOURCE == 0)
diff --git a/unittest/formats/test_pair_unit_convert.cpp b/unittest/formats/test_pair_unit_convert.cpp
index 6c4b38397d..8571c7b442 100644
--- a/unittest/formats/test_pair_unit_convert.cpp
+++ b/unittest/formats/test_pair_unit_convert.cpp
@@ -15,17 +15,15 @@
 #include "force.h"
 #include "info.h"
 #include "input.h"
-#include "lammps.h"
 #include "output.h"
 #include "pair.h"
 #include "thermo.h"
-#include "utils.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-#include <cstdio>
+#include <cmath>
 #include <cstring>
-#include <mpi.h>
+#include <vector>
 
 // whether to print verbose output (i.e. not capturing LAMMPS screen output).
 bool verbose = false;
diff --git a/unittest/formats/test_potential_file_reader.cpp b/unittest/formats/test_potential_file_reader.cpp
index f5b298874f..aaa52b1142 100644
--- a/unittest/formats/test_potential_file_reader.cpp
+++ b/unittest/formats/test_potential_file_reader.cpp
@@ -13,7 +13,6 @@
 
 #include "MANYBODY/pair_comb.h"
 #include "MANYBODY/pair_comb3.h"
-#include "MANYBODY/pair_eim.h"
 #include "MANYBODY/pair_gw.h"
 #include "MANYBODY/pair_gw_zbl.h"
 #include "MANYBODY/pair_nb3b_harmonic.h"
@@ -26,13 +25,13 @@
 #include "USER-MISC/pair_tersoff_table.h"
 #include "info.h"
 #include "input.h"
-#include "lammps.h"
 #include "potential_file_reader.h"
-#include "utils.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
 #include <cstring>
+#include <iostream>
+#include <vector>
 #include <mpi.h>
 
 #if defined(OMPI_MAJOR_VERSION)
diff --git a/unittest/utils/test_fmtlib.cpp b/unittest/utils/test_fmtlib.cpp
index fd9a4a06a2..7233d0ab1a 100644
--- a/unittest/utils/test_fmtlib.cpp
+++ b/unittest/utils/test_fmtlib.cpp
@@ -16,7 +16,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include <exception>
-#include <string>
 
 using namespace LAMMPS_NS;
 using ::testing::Eq;
diff --git a/unittest/utils/test_tokenizer.cpp b/unittest/utils/test_tokenizer.cpp
index 7cef3cead0..28656ef9c8 100644
--- a/unittest/utils/test_tokenizer.cpp
+++ b/unittest/utils/test_tokenizer.cpp
@@ -11,6 +11,7 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "tokenizer.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/unittest/utils/test_utils.cpp b/unittest/utils/test_utils.cpp
index 1a3ca9fa0c..a78830c9d1 100644
--- a/unittest/utils/test_utils.cpp
+++ b/unittest/utils/test_utils.cpp
@@ -11,12 +11,12 @@
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
 
+#include "lmptype.h"
 #include "utils.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include <cerrno>
 #include <cstdio>
-#include <cstdlib>
 #include <string>
 #include <vector>