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/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