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