Fix includes
Run misc-include-cleaner on the codebase and fix all the includes.
misc-include-cleaner gets some things wrong, so had edit those back to
previous. It doesn't seem to like nlohmann or zone.hpp very much.
At some point in the future we could fix these, and get these enforced
at CI time.
Change-Id: Ie087e03dd26570db09e44e5b3f0641fb77668711
Signed-off-by: Ed Tanous <etanous@nvidia.com>
diff --git a/conf.hpp b/conf.hpp
index 8a9ea38..796f80e 100644
--- a/conf.hpp
+++ b/conf.hpp
@@ -3,6 +3,7 @@
#include "pid/ec/pid.hpp"
#include "pid/ec/stepwise.hpp"
+#include <cstdint>
#include <limits>
#include <map>
#include <string>
diff --git a/dbus/dbusconfiguration.cpp b/dbus/dbusconfiguration.cpp
index d86ebde..787ca31 100644
--- a/dbus/dbusconfiguration.cpp
+++ b/dbus/dbusconfiguration.cpp
@@ -13,28 +13,41 @@
// See the License for the specific language governing permissions and
// limitations under the License.
*/
-#include "config.h"
#include "dbusconfiguration.hpp"
#include "conf.hpp"
#include "dbushelper.hpp"
#include "dbusutil.hpp"
+#include "ec/stepwise.hpp"
#include "util.hpp"
+#include <systemd/sd-bus.h>
+
+#include <boost/asio/error.hpp>
#include <boost/asio/steady_timer.hpp>
#include <sdbusplus/bus.hpp>
#include <sdbusplus/bus/match.hpp>
#include <sdbusplus/exception.hpp>
+#include <sdbusplus/message.hpp>
+#include <sdbusplus/message/native_types.hpp>
#include <algorithm>
+#include <array>
#include <chrono>
-#include <functional>
+#include <cstdint>
+#include <format>
#include <iostream>
+#include <limits>
#include <list>
-#include <set>
+#include <map>
+#include <stdexcept>
+#include <string>
+#include <tuple>
#include <unordered_map>
+#include <utility>
#include <variant>
+#include <vector>
namespace pid_control
{
diff --git a/dbus/dbusconfiguration.hpp b/dbus/dbusconfiguration.hpp
index a880a0c..2ef4761 100644
--- a/dbus/dbusconfiguration.hpp
+++ b/dbus/dbusconfiguration.hpp
@@ -19,6 +19,7 @@
#include <boost/asio/steady_timer.hpp>
#include <sdbusplus/bus.hpp>
+#include <sdbusplus/message/native_types.hpp>
#include <cstdint>
#include <map>
diff --git a/dbus/dbushelper.cpp b/dbus/dbushelper.cpp
index 6c1e1c0..2d50c72 100644
--- a/dbus/dbushelper.cpp
+++ b/dbus/dbushelper.cpp
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "config.h"
#include "dbushelper.hpp"
@@ -22,8 +21,11 @@
#include <phosphor-logging/log.hpp>
#include <sdbusplus/bus.hpp>
+#include <sdbusplus/exception.hpp>
+#include <cstdint>
#include <map>
+#include <stdexcept>
#include <string>
#include <variant>
#include <vector>
diff --git a/dbus/dbushelper.hpp b/dbus/dbushelper.hpp
index 357d80e..59ccef2 100644
--- a/dbus/dbushelper.hpp
+++ b/dbus/dbushelper.hpp
@@ -4,6 +4,7 @@
#include <phosphor-logging/log.hpp>
#include <sdbusplus/bus.hpp>
+#include <sdbusplus/exception.hpp>
#include <string>
#include <variant>
diff --git a/dbus/dbuspassive.cpp b/dbus/dbuspassive.cpp
index a0fa217..d53e59e 100644
--- a/dbus/dbuspassive.cpp
+++ b/dbus/dbuspassive.cpp
@@ -13,24 +13,33 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "config.h"
#include "dbuspassive.hpp"
+#include "conf.hpp"
#include "dbushelper_interface.hpp"
#include "dbuspassiveredundancy.hpp"
#include "dbusutil.hpp"
-#include "failsafeloggers/builder.hpp"
#include "failsafeloggers/failsafe_logger_utility.hpp"
+#include "interfaces.hpp"
#include "util.hpp"
+#include <systemd/sd-bus.h>
+
#include <sdbusplus/bus.hpp>
+#include <sdbusplus/message.hpp>
#include <chrono>
#include <cmath>
+#include <cstdint>
+#include <exception>
+#include <limits>
+#include <map>
#include <memory>
#include <mutex>
+#include <set>
#include <string>
+#include <utility>
#include <variant>
#include "failsafeloggers/failsafe_logger.cpp"
diff --git a/dbus/dbuspassive.hpp b/dbus/dbuspassive.hpp
index 156be13..86b5c5a 100644
--- a/dbus/dbuspassive.hpp
+++ b/dbus/dbuspassive.hpp
@@ -4,7 +4,8 @@
#include "dbushelper_interface.hpp"
#include "dbuspassiveredundancy.hpp"
#include "interfaces.hpp"
-#include "util.hpp"
+
+#include <systemd/sd-bus.h>
#include <sdbusplus/bus.hpp>
#include <sdbusplus/bus/match.hpp>
@@ -12,14 +13,10 @@
#include <chrono>
#include <cmath>
-#include <iostream>
-#include <map>
+#include <cstdint>
#include <memory>
#include <mutex>
-#include <set>
#include <string>
-#include <tuple>
-#include <vector>
namespace pid_control
{
diff --git a/dbus/dbuspassiveredundancy.cpp b/dbus/dbuspassiveredundancy.cpp
index 501aa5e..2ccd490 100644
--- a/dbus/dbuspassiveredundancy.cpp
+++ b/dbus/dbuspassiveredundancy.cpp
@@ -18,11 +18,16 @@
#include <sdbusplus/bus.hpp>
#include <sdbusplus/bus/match.hpp>
+#include <sdbusplus/exception.hpp>
+#include <sdbusplus/message.hpp>
+#include <array>
#include <iostream>
#include <set>
+#include <string>
#include <unordered_map>
#include <variant>
+#include <vector>
namespace pid_control
{
diff --git a/dbus/dbuspassiveredundancy.hpp b/dbus/dbuspassiveredundancy.hpp
index 1fd2aed..73fcf0e 100644
--- a/dbus/dbuspassiveredundancy.hpp
+++ b/dbus/dbuspassiveredundancy.hpp
@@ -20,6 +20,7 @@
#include <sdbusplus/bus/match.hpp>
#include <set>
+#include <string>
namespace pid_control
{
diff --git a/dbus/dbusutil.cpp b/dbus/dbusutil.cpp
index 2a0c923..c64977b 100644
--- a/dbus/dbusutil.cpp
+++ b/dbus/dbusutil.cpp
@@ -1,10 +1,8 @@
-#include "util.hpp"
#include <sdbusplus/bus/match.hpp>
#include <cmath>
#include <cstdint>
-#include <iostream>
#include <map>
#include <regex>
#include <set>
diff --git a/dbus/dbusutil.hpp b/dbus/dbusutil.hpp
index ee8d166..0132073 100644
--- a/dbus/dbusutil.hpp
+++ b/dbus/dbusutil.hpp
@@ -4,6 +4,7 @@
#include <map>
#include <stdexcept>
#include <string>
+#include <type_traits>
#include <unordered_map>
#include <utility>
#include <vector>
diff --git a/dbus/dbuswrite.cpp b/dbus/dbuswrite.cpp
index baae941..efb7dee 100644
--- a/dbus/dbuswrite.cpp
+++ b/dbus/dbuswrite.cpp
@@ -17,12 +17,14 @@
#include "dbuswrite.hpp"
#include "dbushelper_interface.hpp"
+#include "interfaces.hpp"
#include <phosphor-logging/log.hpp>
#include <sdbusplus/bus.hpp>
+#include <sdbusplus/exception.hpp>
+#include <cstdint>
#include <exception>
-#include <iostream>
#include <memory>
#include <string>
#include <variant>
diff --git a/dbus/dbuswrite.hpp b/dbus/dbuswrite.hpp
index 3abb075..bf49856 100644
--- a/dbus/dbuswrite.hpp
+++ b/dbus/dbuswrite.hpp
@@ -18,10 +18,8 @@
#include "dbushelper_interface.hpp"
#include "interfaces.hpp"
-#include "util.hpp"
-#include <sdbusplus/bus.hpp>
-
+#include <cstdint>
#include <memory>
#include <string>
diff --git a/experiments/drive.cpp b/experiments/drive.cpp
index 9d3e6dc..687a36c 100644
--- a/experiments/drive.cpp
+++ b/experiments/drive.cpp
@@ -17,13 +17,20 @@
#include "drive.hpp"
#include "interfaces.hpp"
+#include "sensor.hpp"
#include "sensors/pluggable.hpp"
#include "sysfs/sysfsread.hpp"
#include "sysfs/sysfswrite.hpp"
+#include <cerrno>
+#include <chrono>
+#include <cstdint>
#include <iostream>
#include <memory>
+#include <string>
#include <tuple>
+#include <utility>
+#include <vector>
namespace pid_control
{
diff --git a/failsafeloggers/builder.cpp b/failsafeloggers/builder.cpp
index 376e644..b773604 100644
--- a/failsafeloggers/builder.cpp
+++ b/failsafeloggers/builder.cpp
@@ -16,11 +16,12 @@
#include "failsafeloggers/builder.hpp"
-#include "conf.hpp"
#include "failsafeloggers/failsafe_logger.hpp"
#include "failsafeloggers/failsafe_logger_utility.hpp"
#include <algorithm>
+#include <cstddef>
+#include <cstdint>
#include <iostream>
#include <memory>
#include <string>
diff --git a/failsafeloggers/builder.hpp b/failsafeloggers/builder.hpp
index 3c59820..45bf0e4 100644
--- a/failsafeloggers/builder.hpp
+++ b/failsafeloggers/builder.hpp
@@ -1,10 +1,9 @@
#pragma once
-#include "conf.hpp"
-#include "failsafeloggers/failsafe_logger.hpp"
#include "pid/zone_interface.hpp"
-#include "sensors/manager.hpp"
+#include <cstddef>
+#include <cstdint>
#include <memory>
#include <unordered_map>
diff --git a/failsafeloggers/failsafe_logger.cpp b/failsafeloggers/failsafe_logger.cpp
index f1fcb14..1acc7a5 100644
--- a/failsafeloggers/failsafe_logger.cpp
+++ b/failsafeloggers/failsafe_logger.cpp
@@ -1,7 +1,9 @@
#include "failsafe_logger.hpp"
#include <chrono>
+#include <cstdint>
#include <iostream>
+#include <string>
namespace pid_control
{
diff --git a/failsafeloggers/failsafe_logger.hpp b/failsafeloggers/failsafe_logger.hpp
index b53e9f2..82076c9 100644
--- a/failsafeloggers/failsafe_logger.hpp
+++ b/failsafeloggers/failsafe_logger.hpp
@@ -1,9 +1,9 @@
#pragma once
+#include <cstddef>
+#include <cstdint>
#include <deque>
-#include <memory>
#include <string>
-#include <unordered_map>
#include <unordered_set>
namespace pid_control
diff --git a/failsafeloggers/failsafe_logger_utility.cpp b/failsafeloggers/failsafe_logger_utility.cpp
index 40d0506..569d69a 100644
--- a/failsafeloggers/failsafe_logger_utility.cpp
+++ b/failsafeloggers/failsafe_logger_utility.cpp
@@ -1,6 +1,12 @@
#include "failsafe_logger_utility.hpp"
+#include "failsafeloggers/failsafe_logger.hpp"
+
+#include <cstdint>
+#include <memory>
#include <string>
+#include <unordered_map>
+#include <vector>
std::unordered_map<int64_t, std::shared_ptr<pid_control::FailsafeLogger>>
zoneIdToFailsafeLogger =
diff --git a/failsafeloggers/failsafe_logger_utility.hpp b/failsafeloggers/failsafe_logger_utility.hpp
index 465fcdb..8d377a0 100644
--- a/failsafeloggers/failsafe_logger_utility.hpp
+++ b/failsafeloggers/failsafe_logger_utility.hpp
@@ -1,8 +1,8 @@
#pragma once
-#include "conf.hpp"
#include "failsafeloggers/failsafe_logger.hpp"
+#include <cstdint>
#include <memory>
#include <string>
#include <unordered_map>
diff --git a/interfaces.hpp b/interfaces.hpp
index d9934db..c13c377 100644
--- a/interfaces.hpp
+++ b/interfaces.hpp
@@ -1,6 +1,9 @@
#pragma once
#include <chrono>
+#include <cstdint>
+#include <limits>
+#include <string>
namespace pid_control
{
diff --git a/ipmi/dbus_mode.cpp b/ipmi/dbus_mode.cpp
index c72a00a..85427a8 100644
--- a/ipmi/dbus_mode.cpp
+++ b/ipmi/dbus_mode.cpp
@@ -19,9 +19,11 @@
#include <ipmid/api.h>
#include <sdbusplus/bus.hpp>
+#include <sdbusplus/exception.hpp>
#include <sdbusplus/message.hpp>
#include <cstdint>
+#include <map>
#include <string>
#include <variant>
diff --git a/ipmi/main_ipmi.cpp b/ipmi/main_ipmi.cpp
index 2dd6a75..d867dd5 100644
--- a/ipmi/main_ipmi.cpp
+++ b/ipmi/main_ipmi.cpp
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-#include "control.hpp"
#include "dbus_mode.hpp"
#include "manualcmds.hpp"
diff --git a/ipmi/manualcmds.cpp b/ipmi/manualcmds.cpp
index d9c9c49..69817b2 100644
--- a/ipmi/manualcmds.cpp
+++ b/ipmi/manualcmds.cpp
@@ -17,19 +17,14 @@
#include "manualcmds.hpp"
#include "control.hpp"
-#include "dbus_mode.hpp"
#include "manual_messages.hpp"
#include <ipmid/api.h>
-#include <sdbusplus/bus.hpp>
-#include <sdbusplus/message.hpp>
-
-#include <map>
+#include <cstddef>
+#include <cstdint>
#include <memory>
#include <string>
-#include <tuple>
-#include <variant>
namespace pid_control
{
diff --git a/ipmi/manualcmds.hpp b/ipmi/manualcmds.hpp
index 057ffc9..3f4d6d4 100644
--- a/ipmi/manualcmds.hpp
+++ b/ipmi/manualcmds.hpp
@@ -4,8 +4,10 @@
#include <ipmid/api.h>
+#include <cstddef>
#include <cstdint>
#include <memory>
+#include <utility>
namespace pid_control
{
diff --git a/main.cpp b/main.cpp
index 823181a..37c1660 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,25 +14,26 @@
* limitations under the License.
*/
-#include "config.h"
-
#include "buildjson/buildjson.hpp"
#include "conf.hpp"
#include "dbus/dbusconfiguration.hpp"
#include "failsafeloggers/builder.hpp"
-#include "interfaces.hpp"
#include "pid/builder.hpp"
#include "pid/buildjson.hpp"
#include "pid/pidloop.hpp"
#include "pid/tuning.hpp"
-#include "pid/zone.hpp"
#include "sensors/builder.hpp"
#include "sensors/buildjson.hpp"
#include "sensors/manager.hpp"
#include "util.hpp"
+#include "zone_interface.hpp"
+
+#include <signal.h>
#include <CLI/CLI.hpp>
+#include <boost/asio/error.hpp>
#include <boost/asio/io_context.hpp>
+#include <boost/asio/post.hpp>
#include <boost/asio/signal_set.hpp>
#include <boost/asio/steady_timer.hpp>
#include <sdbusplus/asio/connection.hpp>
@@ -40,12 +41,19 @@
#include <sdbusplus/server/manager.hpp>
#include <chrono>
+#include <csignal>
+#include <cstdint>
+#include <cstdlib>
+#include <exception>
#include <filesystem>
+#include <fstream>
#include <iostream>
-#include <list>
#include <map>
#include <memory>
#include <optional>
+#include <stdexcept>
+#include <string>
+#include <tuple>
#include <unordered_map>
#include <utility>
#include <vector>
diff --git a/notimpl/writeonly.cpp b/notimpl/writeonly.cpp
index de354e6..ef54cd5 100644
--- a/notimpl/writeonly.cpp
+++ b/notimpl/writeonly.cpp
@@ -16,6 +16,8 @@
#include "writeonly.hpp"
+#include "interfaces.hpp"
+
#include <stdexcept>
namespace pid_control
diff --git a/pid/builder.cpp b/pid/builder.cpp
index afb6989..7331705 100644
--- a/pid/builder.cpp
+++ b/pid/builder.cpp
@@ -17,6 +17,7 @@
#include "pid/builder.hpp"
#include "conf.hpp"
+#include "manager.hpp"
#include "pid/controller.hpp"
#include "pid/fancontroller.hpp"
#include "pid/stepwisecontroller.hpp"
@@ -29,9 +30,12 @@
#include <cstdint>
#include <iostream>
+#include <map>
#include <memory>
+#include <stdexcept>
#include <string>
#include <unordered_map>
+#include <utility>
#include <vector>
namespace pid_control
diff --git a/pid/builder.hpp b/pid/builder.hpp
index acfc6dd..9afb000 100644
--- a/pid/builder.hpp
+++ b/pid/builder.hpp
@@ -6,6 +6,8 @@
#include <sdbusplus/bus.hpp>
+#include <cstdint>
+#include <map>
#include <memory>
#include <unordered_map>
diff --git a/pid/buildjson.cpp b/pid/buildjson.cpp
index feb3bb8..e633890 100644
--- a/pid/buildjson.cpp
+++ b/pid/buildjson.cpp
@@ -17,14 +17,19 @@
#include "pid/buildjson.hpp"
#include "conf.hpp"
+#include "ec/stepwise.hpp"
#include "util.hpp"
#include <nlohmann/json.hpp>
+#include <cstddef>
+#include <cstdint>
#include <iostream>
#include <limits>
#include <map>
-#include <tuple>
+#include <string>
+#include <utility>
+#include <vector>
namespace pid_control
{
diff --git a/pid/buildjson.hpp b/pid/buildjson.hpp
index 56267fa..5daab6e 100644
--- a/pid/buildjson.hpp
+++ b/pid/buildjson.hpp
@@ -4,8 +4,9 @@
#include <nlohmann/json.hpp>
+#include <cstdint>
#include <map>
-#include <tuple>
+#include <utility>
namespace pid_control
{
diff --git a/pid/controller.hpp b/pid/controller.hpp
index 5680052..464a8e4 100644
--- a/pid/controller.hpp
+++ b/pid/controller.hpp
@@ -1,8 +1,5 @@
#pragma once
-#include "ec/pid.hpp"
-#include "fan.hpp"
-
#include <string>
namespace pid_control
diff --git a/pid/ec/logging.cpp b/pid/ec/logging.cpp
index 57f1e7e..0b8e7c9 100644
--- a/pid/ec/logging.cpp
+++ b/pid/ec/logging.cpp
@@ -20,10 +20,12 @@
#include "pid.hpp"
#include <chrono>
+#include <cstddef>
#include <fstream>
#include <iostream>
#include <map>
#include <string>
+#include <utility>
namespace pid_control
{
diff --git a/pid/ec/logging.hpp b/pid/ec/logging.hpp
index 049d2ed..819d985 100644
--- a/pid/ec/logging.hpp
+++ b/pid/ec/logging.hpp
@@ -5,8 +5,8 @@
#include <chrono>
#include <cstring>
#include <fstream>
-#include <iostream>
#include <string>
+#include <utility>
namespace pid_control
{
diff --git a/pid/ec/pid.cpp b/pid/ec/pid.cpp
index ad547d9..b6acb51 100644
--- a/pid/ec/pid.cpp
+++ b/pid/ec/pid.cpp
@@ -16,9 +16,11 @@
#include "pid.hpp"
-#include "../tuning.hpp"
#include "logging.hpp"
+#include <chrono>
+#include <string>
+
namespace pid_control
{
namespace ec
diff --git a/pid/ec/pid.hpp b/pid/ec/pid.hpp
index 603f8c1..0ab89cc 100644
--- a/pid/ec/pid.hpp
+++ b/pid/ec/pid.hpp
@@ -1,6 +1,5 @@
#pragma once
-#include <cstdint>
#include <string>
namespace pid_control
diff --git a/pid/ec/stepwise.cpp b/pid/ec/stepwise.cpp
index c3e61e8..b768416 100644
--- a/pid/ec/stepwise.cpp
+++ b/pid/ec/stepwise.cpp
@@ -18,7 +18,6 @@
#include <cmath>
#include <cstddef>
-#include <limits>
namespace pid_control
{
diff --git a/pid/ec/stepwise.hpp b/pid/ec/stepwise.hpp
index 88db332..ca53d39 100644
--- a/pid/ec/stepwise.hpp
+++ b/pid/ec/stepwise.hpp
@@ -18,7 +18,6 @@
#pragma once
#include <cstddef>
-#include <vector>
namespace pid_control
{
diff --git a/pid/fancontroller.cpp b/pid/fancontroller.cpp
index 11538be..9b54714 100644
--- a/pid/fancontroller.cpp
+++ b/pid/fancontroller.cpp
@@ -13,17 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "config.h"
#include "fancontroller.hpp"
+#include "ec/pid.hpp"
+#include "fan.hpp"
+#include "pidcontroller.hpp"
#include "tuning.hpp"
#include "util.hpp"
-#include "zone.hpp"
+#include "zone_interface.hpp"
#include <algorithm>
#include <cmath>
+#include <cstdint>
+#include <exception>
#include <iostream>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
namespace pid_control
{
diff --git a/pid/pidcontroller.cpp b/pid/pidcontroller.cpp
index c983c35..adccfce 100644
--- a/pid/pidcontroller.cpp
+++ b/pid/pidcontroller.cpp
@@ -18,13 +18,7 @@
#include "ec/pid.hpp"
-#include <algorithm>
-#include <chrono>
#include <cmath>
-#include <iostream>
-#include <map>
-#include <memory>
-#include <vector>
namespace pid_control
{
diff --git a/pid/pidcontroller.hpp b/pid/pidcontroller.hpp
index e1868f4..8e3d415 100644
--- a/pid/pidcontroller.hpp
+++ b/pid/pidcontroller.hpp
@@ -2,11 +2,9 @@
#include "controller.hpp"
#include "ec/pid.hpp"
-#include "fan.hpp"
#include <limits>
-#include <memory>
-#include <vector>
+#include <string>
namespace pid_control
{
diff --git a/pid/pidloop.cpp b/pid/pidloop.cpp
index 9d30798..af0d24f 100644
--- a/pid/pidloop.cpp
+++ b/pid/pidloop.cpp
@@ -19,15 +19,15 @@
#include "pid/pidcontroller.hpp"
#include "pid/tuning.hpp"
#include "pid/zone_interface.hpp"
-#include "sensors/sensor.hpp"
+#include <boost/asio/error.hpp>
#include <boost/asio/steady_timer.hpp>
#include <chrono>
-#include <map>
+#include <cstdint>
#include <memory>
+#include <ostream>
#include <sstream>
-#include <vector>
namespace pid_control
{
diff --git a/pid/pidloop.hpp b/pid/pidloop.hpp
index 70e0415..7eb78bf 100644
--- a/pid/pidloop.hpp
+++ b/pid/pidloop.hpp
@@ -4,6 +4,9 @@
#include <boost/asio/steady_timer.hpp>
+#include <cstdint>
+#include <memory>
+
namespace pid_control
{
diff --git a/pid/stepwisecontroller.cpp b/pid/stepwisecontroller.cpp
index 2ed3d41..e3022b6 100644
--- a/pid/stepwisecontroller.cpp
+++ b/pid/stepwisecontroller.cpp
@@ -16,6 +16,7 @@
#include "stepwisecontroller.hpp"
+#include "controller.hpp"
#include "ec/stepwise.hpp"
#include "errors/exception.hpp"
#include "tuning.hpp"
@@ -23,11 +24,11 @@
#include "zone.hpp"
#include <algorithm>
-#include <chrono>
#include <cmath>
#include <iostream>
-#include <map>
+#include <limits>
#include <memory>
+#include <string>
#include <vector>
namespace pid_control
diff --git a/pid/stepwisecontroller.hpp b/pid/stepwisecontroller.hpp
index f1f7fe9..37e4ead 100644
--- a/pid/stepwisecontroller.hpp
+++ b/pid/stepwisecontroller.hpp
@@ -2,10 +2,10 @@
#include "controller.hpp"
#include "ec/stepwise.hpp"
-#include "fan.hpp"
#include <limits>
#include <memory>
+#include <string>
#include <vector>
namespace pid_control
diff --git a/pid/thermalcontroller.cpp b/pid/thermalcontroller.cpp
index cf8564b..b9ea1c2 100644
--- a/pid/thermalcontroller.cpp
+++ b/pid/thermalcontroller.cpp
@@ -16,14 +16,21 @@
#include "thermalcontroller.hpp"
+#include "conf.hpp"
+#include "ec/pid.hpp"
#include "errors/exception.hpp"
+#include "pidcontroller.hpp"
#include "tuning.hpp"
#include "util.hpp"
-#include "zone.hpp"
+#include "zone_interface.hpp"
#include <algorithm>
#include <cmath>
#include <iostream>
+#include <limits>
+#include <memory>
+#include <string>
+#include <vector>
namespace pid_control
{
diff --git a/pid/zone.cpp b/pid/zone.cpp
index dfa5123..835b79e 100644
--- a/pid/zone.cpp
+++ b/pid/zone.cpp
@@ -19,21 +19,26 @@
#include "conf.hpp"
#include "failsafeloggers/failsafe_logger_utility.hpp"
+#include "interfaces.hpp"
#include "pid/controller.hpp"
-#include "pid/ec/pid.hpp"
-#include "pid/fancontroller.hpp"
-#include "pid/stepwisecontroller.hpp"
-#include "pid/thermalcontroller.hpp"
#include "pid/tuning.hpp"
+#include <sdbusplus/bus.hpp>
+
#include <algorithm>
#include <chrono>
+#include <cstdint>
#include <cstring>
+#include <exception>
#include <fstream>
#include <iostream>
+#include <limits>
#include <memory>
#include <sstream>
#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
using tstamp = std::chrono::high_resolution_clock::time_point;
using namespace std::literals::chrono_literals;
diff --git a/pid/zone.hpp b/pid/zone.hpp
index 7223f76..d81cd53 100644
--- a/pid/zone.hpp
+++ b/pid/zone.hpp
@@ -3,6 +3,7 @@
#include "conf.hpp"
#include "controller.hpp"
#include "failsafeloggers/failsafe_logger_utility.hpp"
+#include "interfaces.hpp"
#include "pidcontroller.hpp"
#include "sensors/manager.hpp"
#include "sensors/sensor.hpp"
@@ -10,18 +11,22 @@
#include "zone_interface.hpp"
#include <sdbusplus/bus.hpp>
-#include <sdbusplus/server.hpp>
+#include <sdbusplus/server/object.hpp>
#include <xyz/openbmc_project/Control/Mode/server.hpp>
#include <xyz/openbmc_project/Debug/Pid/ThermalPower/server.hpp>
#include <xyz/openbmc_project/Debug/Pid/Zone/server.hpp>
#include <xyz/openbmc_project/Object/Enable/server.hpp>
+#include <chrono>
+#include <cstdint>
#include <fstream>
#include <iostream>
#include <map>
#include <memory>
#include <set>
#include <string>
+#include <string_view>
+#include <utility>
#include <vector>
template <typename... T>
diff --git a/pid/zone_interface.hpp b/pid/zone_interface.hpp
index 808b80f..861dde7 100644
--- a/pid/zone_interface.hpp
+++ b/pid/zone_interface.hpp
@@ -1,9 +1,14 @@
#pragma once
+#include "interfaces.hpp"
#include "sensors/sensor.hpp"
+#include <cstdint>
#include <map>
#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
namespace pid_control
{
diff --git a/sensors/build_utils.cpp b/sensors/build_utils.cpp
index c3c7ce1..04e8d05 100644
--- a/sensors/build_utils.cpp
+++ b/sensors/build_utils.cpp
@@ -16,6 +16,8 @@
#include "build_utils.hpp"
+#include <string>
+
namespace pid_control
{
diff --git a/sensors/builder.cpp b/sensors/builder.cpp
index 1c63623..e523b26 100644
--- a/sensors/builder.cpp
+++ b/sensors/builder.cpp
@@ -18,12 +18,14 @@
#include <map>
#include <memory>
#include <string>
+#include <utility>
/* Configuration. */
#include "conf.hpp"
#include "dbus/dbushelper.hpp"
#include "dbus/dbuspassive.hpp"
#include "dbus/dbuswrite.hpp"
+#include "dbuspassiveredundancy.hpp"
#include "errors/exception.hpp"
#include "interfaces.hpp"
#include "notimpl/readonly.hpp"
@@ -35,7 +37,8 @@
#include "sensors/pluggable.hpp"
#include "sysfs/sysfsread.hpp"
#include "sysfs/sysfswrite.hpp"
-#include "util.hpp"
+
+#include <sdbusplus/bus.hpp>
namespace pid_control
{
diff --git a/sensors/builder.hpp b/sensors/builder.hpp
index 345da5d..ed685fd 100644
--- a/sensors/builder.hpp
+++ b/sensors/builder.hpp
@@ -2,7 +2,6 @@
#include "conf.hpp"
#include "sensors/manager.hpp"
-#include "sensors/sensor.hpp"
#include <sdbusplus/bus.hpp>
diff --git a/sensors/buildjson.cpp b/sensors/buildjson.cpp
index b8120a8..c5ef849 100644
--- a/sensors/buildjson.cpp
+++ b/sensors/buildjson.cpp
@@ -22,6 +22,7 @@
#include <nlohmann/json.hpp>
#include <cstdio>
+#include <map>
using json = nlohmann::json;
diff --git a/sensors/host.cpp b/sensors/host.cpp
index 39eeb5f..0bf78e0 100644
--- a/sensors/host.cpp
+++ b/sensors/host.cpp
@@ -17,11 +17,19 @@
#include "host.hpp"
#include "failsafeloggers/failsafe_logger_utility.hpp"
+#include "interfaces.hpp"
+#include "sensor.hpp"
+#include <sdbusplus/bus.hpp>
+
+#include <chrono>
#include <cmath>
-#include <iostream>
+#include <cstdint>
#include <memory>
#include <mutex>
+#include <stdexcept>
+#include <string>
+#include <type_traits>
namespace pid_control
{
diff --git a/sensors/host.hpp b/sensors/host.hpp
index 170d94a..d3f97ed 100644
--- a/sensors/host.hpp
+++ b/sensors/host.hpp
@@ -1,13 +1,17 @@
#pragma once
+#include "interfaces.hpp"
#include "sensor.hpp"
#include <sdbusplus/bus.hpp>
-#include <sdbusplus/server.hpp>
+#include <sdbusplus/server/object.hpp>
#include <xyz/openbmc_project/Sensor/Value/server.hpp>
+#include <chrono>
+#include <cstdint>
#include <memory>
#include <mutex>
+#include <string>
#include <type_traits>
template <typename... T>
diff --git a/sensors/manager.cpp b/sensors/manager.cpp
index 95d2a6b..1f81038 100644
--- a/sensors/manager.cpp
+++ b/sensors/manager.cpp
@@ -17,10 +17,11 @@
/* Configuration. */
#include "sensors/manager.hpp"
-#include "conf.hpp"
+#include "sensor.hpp"
#include <memory>
#include <string>
+#include <utility>
namespace pid_control
{
diff --git a/sensors/manager.hpp b/sensors/manager.hpp
index 6ae39fd..f5ac50f 100644
--- a/sensors/manager.hpp
+++ b/sensors/manager.hpp
@@ -5,6 +5,7 @@
#include <sdbusplus/bus.hpp>
#include <sdbusplus/server.hpp>
+#include <functional>
#include <map>
#include <memory>
#include <string>
diff --git a/sensors/pluggable.cpp b/sensors/pluggable.cpp
index da0b2f8..f9844f5 100644
--- a/sensors/pluggable.cpp
+++ b/sensors/pluggable.cpp
@@ -16,6 +16,11 @@
#include "pluggable.hpp"
+#include "interfaces.hpp"
+
+#include <cstdint>
+#include <string>
+
namespace pid_control
{
diff --git a/sensors/pluggable.hpp b/sensors/pluggable.hpp
index d139876..b65aefd 100644
--- a/sensors/pluggable.hpp
+++ b/sensors/pluggable.hpp
@@ -3,8 +3,10 @@
#include "interfaces.hpp"
#include "sensor.hpp"
+#include <cstdint>
#include <memory>
#include <string>
+#include <utility>
namespace pid_control
{
diff --git a/sensors/sensor.hpp b/sensors/sensor.hpp
index ca1813e..e319d2b 100644
--- a/sensors/sensor.hpp
+++ b/sensors/sensor.hpp
@@ -2,6 +2,7 @@
#include "interfaces.hpp"
+#include <cstdint>
#include <string>
namespace pid_control
diff --git a/setsensor.cpp b/setsensor.cpp
index 61bdfb4..faca6b7 100644
--- a/setsensor.cpp
+++ b/setsensor.cpp
@@ -1,7 +1,9 @@
#include <sdbusplus/bus.hpp>
+#include <sdbusplus/exception.hpp>
#include <sdbusplus/message.hpp>
-#include <iostream>
+#include <cstdint>
+#include <cstdio>
#include <string>
#include <variant>
diff --git a/sysfs/sysfsread.cpp b/sysfs/sysfsread.cpp
index deb533a..d9ea915 100644
--- a/sysfs/sysfsread.cpp
+++ b/sysfs/sysfsread.cpp
@@ -16,7 +16,10 @@
#include "sysfs/sysfsread.hpp"
+#include "interfaces.hpp"
+
#include <chrono>
+#include <cstdint>
#include <fstream>
#include <iostream>
diff --git a/sysfs/sysfswrite.cpp b/sysfs/sysfswrite.cpp
index db903cb..69ad815 100644
--- a/sysfs/sysfswrite.cpp
+++ b/sysfs/sysfswrite.cpp
@@ -16,6 +16,7 @@
#include "sysfswrite.hpp"
+#include <cstdint>
#include <fstream>
#include <iostream>
diff --git a/sysfs/sysfswrite.hpp b/sysfs/sysfswrite.hpp
index 615cb37..d24dca4 100644
--- a/sysfs/sysfswrite.hpp
+++ b/sysfs/sysfswrite.hpp
@@ -3,6 +3,7 @@
#include "interfaces.hpp"
#include "util.hpp"
+#include <cstdint>
#include <string>
namespace pid_control
diff --git a/sysfs/util.cpp b/sysfs/util.cpp
index 214d668..307e3ab 100644
--- a/sysfs/util.cpp
+++ b/sysfs/util.cpp
@@ -17,7 +17,6 @@
#include "util.hpp"
#include <filesystem>
-#include <iostream>
#include <string>
namespace pid_control
diff --git a/test/controller_mock.hpp b/test/controller_mock.hpp
index 533b6db..30b7bef 100644
--- a/test/controller_mock.hpp
+++ b/test/controller_mock.hpp
@@ -4,6 +4,8 @@
#include "pid/pidcontroller.hpp"
#include "pid/zone_interface.hpp"
+#include <string>
+
#include <gmock/gmock.h>
namespace pid_control
diff --git a/test/dbus_passive_unittest.cpp b/test/dbus_passive_unittest.cpp
index 9989e0d..c7e1346 100644
--- a/test/dbus_passive_unittest.cpp
+++ b/test/dbus_passive_unittest.cpp
@@ -1,16 +1,21 @@
#include "conf.hpp"
+#include "dbus/dbushelper_interface.hpp"
#include "dbus/dbuspassive.hpp"
-#include "failsafeloggers/builder.hpp"
-#include "failsafeloggers/failsafe_logger.hpp"
-#include "failsafeloggers/failsafe_logger_utility.hpp"
+#include "interfaces.hpp"
#include "test/dbushelper_mock.hpp"
+#include <systemd/sd-bus.h>
+
+#include <sdbusplus/bus.hpp>
+#include <sdbusplus/message.hpp>
#include <sdbusplus/test/sdbus_mock.hpp>
+#include <cmath>
+#include <cstdint>
#include <functional>
#include <memory>
#include <string>
-#include <variant>
+#include <utility>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
diff --git a/test/dbus_util_unittest.cpp b/test/dbus_util_unittest.cpp
index 09d1b5c..7ae303b 100644
--- a/test/dbus_util_unittest.cpp
+++ b/test/dbus_util_unittest.cpp
@@ -1,5 +1,7 @@
#include "dbus/dbusutil.hpp"
+#include <cstdint>
+#include <map>
#include <string>
#include <tuple>
#include <unordered_map>
diff --git a/test/dbushelper_mock.hpp b/test/dbushelper_mock.hpp
index b11eff3..646ddd1 100644
--- a/test/dbushelper_mock.hpp
+++ b/test/dbushelper_mock.hpp
@@ -1,7 +1,6 @@
#pragma once
#include "dbus/dbushelper_interface.hpp"
-#include "util.hpp"
#include <string>
diff --git a/test/helpers.hpp b/test/helpers.hpp
index c1715fe..bcb269a 100644
--- a/test/helpers.hpp
+++ b/test/helpers.hpp
@@ -1,6 +1,8 @@
// THIS EXISTS AS A COPY OF SDBUSPLUS/TEST/HELPERS.HPP until that is merged.
#pragma once
+#include <systemd/sd-bus.h>
+
#include <sdbusplus/test/sdbus_mock.hpp>
#include <string>
diff --git a/test/json_parse_unittest.cpp b/test/json_parse_unittest.cpp
index f8967de..3a157a2 100644
--- a/test/json_parse_unittest.cpp
+++ b/test/json_parse_unittest.cpp
@@ -1,7 +1,6 @@
#include "buildjson/buildjson.hpp"
#include "errors/exception.hpp"
-#include <gmock/gmock.h>
#include <gtest/gtest.h>
namespace pid_control
diff --git a/test/pid_fancontroller_unittest.cpp b/test/pid_fancontroller_unittest.cpp
index 3fc6433..315931f 100644
--- a/test/pid_fancontroller_unittest.cpp
+++ b/test/pid_fancontroller_unittest.cpp
@@ -1,14 +1,14 @@
-#include "config.h"
-#include "failsafeloggers/builder.hpp"
-#include "failsafeloggers/failsafe_logger.hpp"
-#include "failsafeloggers/failsafe_logger_utility.hpp"
-#include "pid/ec/logging.hpp"
#include "pid/ec/pid.hpp"
+#include "pid/fan.hpp"
#include "pid/fancontroller.hpp"
+#include "pid/pidcontroller.hpp"
+#include "sensors/sensor.hpp"
#include "test/sensor_mock.hpp"
#include "test/zone_mock.hpp"
+#include <cstdint>
+#include <memory>
#include <string>
#include <vector>
diff --git a/test/pid_json_unittest.cpp b/test/pid_json_unittest.cpp
index 59db343..690e6dd 100644
--- a/test/pid_json_unittest.cpp
+++ b/test/pid_json_unittest.cpp
@@ -1,6 +1,12 @@
+#include "conf.hpp"
#include "pid/buildjson.hpp"
-#include <gmock/gmock.h>
+#include <sys/types.h>
+
+#include <cstdint>
+#include <map>
+#include <tuple>
+
#include <gtest/gtest.h>
namespace pid_control
diff --git a/test/pid_stepwisecontroller_unittest.cpp b/test/pid_stepwisecontroller_unittest.cpp
index a832ed7..c730606 100644
--- a/test/pid_stepwisecontroller_unittest.cpp
+++ b/test/pid_stepwisecontroller_unittest.cpp
@@ -3,6 +3,8 @@
#include "pid/stepwisecontroller.hpp"
#include "test/zone_mock.hpp"
+#include <limits>
+#include <memory>
#include <string>
#include <vector>
diff --git a/test/pid_thermalcontroller_unittest.cpp b/test/pid_thermalcontroller_unittest.cpp
index b4b1e5d..49e0ef6 100644
--- a/test/pid_thermalcontroller_unittest.cpp
+++ b/test/pid_thermalcontroller_unittest.cpp
@@ -1,9 +1,11 @@
#include "conf.hpp"
-#include "pid/ec/logging.hpp"
#include "pid/ec/pid.hpp"
+#include "pid/pidcontroller.hpp"
#include "pid/thermalcontroller.hpp"
#include "test/zone_mock.hpp"
+#include <exception>
+#include <memory>
#include <string>
#include <vector>
diff --git a/test/pid_zone_unittest.cpp b/test/pid_zone_unittest.cpp
index 37fb0fa..fee388c 100644
--- a/test/pid_zone_unittest.cpp
+++ b/test/pid_zone_unittest.cpp
@@ -1,20 +1,29 @@
+#include "conf.hpp"
#include "failsafeloggers/builder.hpp"
-#include "failsafeloggers/failsafe_logger.hpp"
-#include "failsafeloggers/failsafe_logger_utility.hpp"
-#include "pid/ec/logging.hpp"
+#include "interfaces.hpp"
#include "pid/ec/pid.hpp"
+#include "pid/pidcontroller.hpp"
#include "pid/zone.hpp"
+#include "pid/zone_interface.hpp"
#include "sensors/manager.hpp"
+#include "sensors/sensor.hpp"
#include "test/controller_mock.hpp"
#include "test/helpers.hpp"
#include "test/sensor_mock.hpp"
+#include <systemd/sd-bus.h>
+
#include <sdbusplus/test/sdbus_mock.hpp>
#include <chrono>
+#include <cstdint>
#include <cstring>
+#include <map>
+#include <memory>
#include <optional>
+#include <string>
#include <unordered_map>
+#include <utility>
#include <vector>
#include <gmock/gmock.h>
diff --git a/test/sensor_host_unittest.cpp b/test/sensor_host_unittest.cpp
index 5e958c0..61d1ed6 100644
--- a/test/sensor_host_unittest.cpp
+++ b/test/sensor_host_unittest.cpp
@@ -1,12 +1,14 @@
-#include "failsafeloggers/builder.hpp"
-#include "failsafeloggers/failsafe_logger.hpp"
-#include "failsafeloggers/failsafe_logger_utility.hpp"
+#include "interfaces.hpp"
#include "sensors/host.hpp"
+#include "sensors/sensor.hpp"
#include "test/helpers.hpp"
+#include <systemd/sd-bus.h>
+
#include <sdbusplus/test/sdbus_mock.hpp>
#include <chrono>
+#include <cstdint>
#include <memory>
#include <string>
#include <vector>
diff --git a/test/sensor_manager_unittest.cpp b/test/sensor_manager_unittest.cpp
index 85865a8..063aac3 100644
--- a/test/sensor_manager_unittest.cpp
+++ b/test/sensor_manager_unittest.cpp
@@ -1,8 +1,14 @@
#include "sensors/manager.hpp"
+#include "sensors/sensor.hpp"
#include "test/sensor_mock.hpp"
#include <sdbusplus/test/sdbus_mock.hpp>
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <utility>
+
#include <gmock/gmock.h>
#include <gtest/gtest.h>
diff --git a/test/sensor_mock.hpp b/test/sensor_mock.hpp
index ae4cf13..2016156 100644
--- a/test/sensor_mock.hpp
+++ b/test/sensor_mock.hpp
@@ -3,6 +3,9 @@
#include "interfaces.hpp"
#include "sensors/sensor.hpp"
+#include <cstdint>
+#include <string>
+
#include <gmock/gmock.h>
namespace pid_control
diff --git a/test/sensor_pluggable_unittest.cpp b/test/sensor_pluggable_unittest.cpp
index ffd08cd..98dd3ce 100644
--- a/test/sensor_pluggable_unittest.cpp
+++ b/test/sensor_pluggable_unittest.cpp
@@ -1,8 +1,13 @@
+#include "interfaces.hpp"
#include "sensors/pluggable.hpp"
#include "test/readinterface_mock.hpp"
#include "test/writeinterface_mock.hpp"
#include <chrono>
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <utility>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
diff --git a/test/sensors_json_unittest.cpp b/test/sensors_json_unittest.cpp
index 257b6d7..611c724 100644
--- a/test/sensors_json_unittest.cpp
+++ b/test/sensors_json_unittest.cpp
@@ -1,7 +1,8 @@
#include "sensors/buildjson.hpp"
#include "sensors/sensor.hpp"
-#include <gmock/gmock.h>
+#include <sys/types.h>
+
#include <gtest/gtest.h>
namespace pid_control
diff --git a/test/util_unittest.cpp b/test/util_unittest.cpp
index 457c470..b74cccf 100644
--- a/test/util_unittest.cpp
+++ b/test/util_unittest.cpp
@@ -2,7 +2,6 @@
#include <string>
-#include <gmock/gmock.h>
#include <gtest/gtest.h>
namespace pid_control
diff --git a/test/writeinterface_mock.hpp b/test/writeinterface_mock.hpp
index 409178c..7bf6f1c 100644
--- a/test/writeinterface_mock.hpp
+++ b/test/writeinterface_mock.hpp
@@ -2,6 +2,8 @@
#include "interfaces.hpp"
+#include <cstdint>
+
#include <gmock/gmock.h>
namespace pid_control
diff --git a/test/zone_mock.hpp b/test/zone_mock.hpp
index dcf6b2a..7d3a199 100644
--- a/test/zone_mock.hpp
+++ b/test/zone_mock.hpp
@@ -1,8 +1,14 @@
#pragma once
+#include "interfaces.hpp"
#include "pid/zone_interface.hpp"
+#include "sensors/sensor.hpp"
+#include <cstdint>
+#include <map>
#include <string>
+#include <string_view>
+#include <utility>
#include <vector>
#include <gmock/gmock.h>
diff --git a/util.cpp b/util.cpp
index 84c1889..bced2c9 100644
--- a/util.cpp
+++ b/util.cpp
@@ -17,10 +17,14 @@
#include "conf.hpp"
+#include <cstddef>
#include <cstdint>
#include <iostream>
+#include <limits>
#include <map>
+#include <set>
#include <string>
+#include <vector>
namespace pid_control
{
diff --git a/util.hpp b/util.hpp
index 60dcfc1..1eb683c 100644
--- a/util.hpp
+++ b/util.hpp
@@ -3,13 +3,11 @@
#include "conf.hpp"
#include "pid/ec/pid.hpp"
-#include <phosphor-logging/log.hpp>
-#include <sdbusplus/bus.hpp>
-
#include <cstdint>
#include <limits>
#include <map>
#include <string>
+#include <vector>
namespace pid_control
{