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