diff --git a/cold-redundancy/cold_redundancy.cpp b/cold-redundancy/cold_redundancy.cpp
index 891c242..2409e0a 100644
--- a/cold-redundancy/cold_redundancy.cpp
+++ b/cold-redundancy/cold_redundancy.cpp
@@ -16,22 +16,23 @@
 
 #include "types.hpp"
 
-#include <array>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/asio/post.hpp>
 #include <boost/container/flat_set.hpp>
 #include <cold_redundancy.hpp>
-#include <filesystem>
-#include <fstream>
-#include <iostream>
 #include <phosphor-logging/elog-errors.hpp>
-#include <regex>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
 #include <sdbusplus/asio/sd_event.hpp>
 #include <sdbusplus/bus/match.hpp>
 
+#include <array>
+#include <filesystem>
+#include <fstream>
+#include <iostream>
+#include <regex>
+
 namespace
 {
 constexpr const std::array<const char*, 1> psuInterfaceTypes = {
diff --git a/cold-redundancy/util.hpp b/cold-redundancy/util.hpp
index 8ad4840..e6e91fd 100644
--- a/cold-redundancy/util.hpp
+++ b/cold-redundancy/util.hpp
@@ -16,10 +16,11 @@
 
 #pragma once
 #include <boost/container/flat_map.hpp>
+#include <sdbusplus/asio/connection.hpp>
+
 #include <chrono>
 #include <cstdint>
 #include <iostream>
-#include <sdbusplus/asio/connection.hpp>
 
 namespace CR
 {
diff --git a/phosphor-regulators/test/validate-regulators-config_tests.cpp b/phosphor-regulators/test/validate-regulators-config_tests.cpp
index 08e798d..a352f36 100644
--- a/phosphor-regulators/test/validate-regulators-config_tests.cpp
+++ b/phosphor-regulators/test/validate-regulators-config_tests.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2020 IBM Corporation
+ * Copyright c 2020 IBM Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,10 @@
 #include <stdlib.h>
 #include <sys/wait.h>
 
-#include <fstream>
 #include <nlohmann/json.hpp>
 
+#include <fstream>
+
 #include <gtest/gtest.h>
 
 #define EXPECT_FILE_VALID(configFile) expectFileValid(configFile)
@@ -286,4 +287,4 @@
         EXPECT_JSON_INVALID(configFile, "Validation failed.",
                             "[] is too short");
     }
-}
\ No newline at end of file
+}