diff --git a/fail-monitor/argument.cpp b/fail-monitor/argument.cpp
index daf0177..33194ce 100644
--- a/fail-monitor/argument.cpp
+++ b/fail-monitor/argument.cpp
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include "argument.hpp"
+
+#include <algorithm>
 #include <iostream>
 #include <iterator>
-#include <algorithm>
-#include "argument.hpp"
 
 namespace phosphor
 {
@@ -85,6 +86,6 @@
 
 const std::string ArgumentParser::trueString = "true";
 const std::string ArgumentParser::emptyString = "";
-}
-}
-}
+} // namespace failure
+} // namespace unit
+} // namespace phosphor
diff --git a/fail-monitor/argument.hpp b/fail-monitor/argument.hpp
index 00f3755..8648ddd 100644
--- a/fail-monitor/argument.hpp
+++ b/fail-monitor/argument.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <getopt.h>
+
 #include <map>
 #include <string>
 
@@ -62,6 +63,6 @@
     /** @brief optstring as needed by getopt_long */
     static const char* optionStr;
 };
-}
-}
-}
+} // namespace failure
+} // namespace unit
+} // namespace phosphor
diff --git a/fail-monitor/main.cpp b/fail-monitor/main.cpp
index 2c3bc59..90c6126 100644
--- a/fail-monitor/main.cpp
+++ b/fail-monitor/main.cpp
@@ -20,11 +20,12 @@
  * then it will either stop or start the target unit, depending
  * on the command line arguments.
  */
-#include <iostream>
-#include <map>
 #include "argument.hpp"
 #include "monitor.hpp"
 
+#include <iostream>
+#include <map>
+
 using namespace phosphor::unit::failure;
 
 /**
diff --git a/fail-monitor/monitor.cpp b/fail-monitor/monitor.cpp
index 9a0722a..51eb1f3 100644
--- a/fail-monitor/monitor.cpp
+++ b/fail-monitor/monitor.cpp
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <phosphor-logging/log.hpp>
 #include "monitor.hpp"
 
+#include <phosphor-logging/log.hpp>
+
 namespace phosphor
 {
 namespace unit
@@ -115,6 +116,6 @@
         throw std::runtime_error("Failed to run action on the target unit");
     }
 }
-}
-}
-}
+} // namespace failure
+} // namespace unit
+} // namespace phosphor
diff --git a/fail-monitor/monitor.hpp b/fail-monitor/monitor.hpp
index 0c2b33a..df8a30a 100644
--- a/fail-monitor/monitor.hpp
+++ b/fail-monitor/monitor.hpp
@@ -102,6 +102,6 @@
      */
     const Action action;
 };
-}
-}
-}
+} // namespace failure
+} // namespace unit
+} // namespace phosphor