diff --git a/include/benchmark/benchmark.h b/include/benchmark/benchmark.h
index 7dad6f4046..bd3b0ffb4c 100644
--- a/include/benchmark/benchmark.h
+++ b/include/benchmark/benchmark.h
@@ -382,16 +382,17 @@ namespace internal {
 class ThreadTimer;
 class ThreadManager;
 
+enum ReportMode
 #if defined(BENCHMARK_HAS_CXX11)
-enum ReportMode : unsigned {
+  : unsigned
 #else
-enum ReportMode {
 #endif
+  {
   RM_Unspecified,  // The mode has not been manually specified
   RM_Default,      // The mode is user-specified as default.
   RM_ReportAggregatesOnly
 };
-}
+}  // namespace internal
 
 // State is passed to a running Benchmark and contains state for the
 // benchmark to use.
@@ -815,7 +816,7 @@ class LambdaBenchmark : public Benchmark {
 };
 #endif
 
-}  // end namespace internal
+}  // namespace internal
 
 inline internal::Benchmark* RegisterBenchmark(const char* name,
                                               internal::Function* fn) {
@@ -867,7 +868,7 @@ class Fixture : public internal::Benchmark {
   virtual void BenchmarkCase(State&) = 0;
 };
 
-}  // namespace internal
+}  // namespace benchmark
 
 // ------------------------------------------------------
 // Macro to register benchmarks
diff --git a/src/csv_reporter.cc b/src/csv_reporter.cc
index 261b151430..35510645b0 100644
--- a/src/csv_reporter.cc
+++ b/src/csv_reporter.cc
@@ -35,7 +35,7 @@ std::vector<std::string> elements = {
     "name",           "iterations",       "real_time",        "cpu_time",
     "time_unit",      "bytes_per_second", "items_per_second", "label",
     "error_occurred", "error_message"};
-}
+}  // namespace
 
 bool CSVReporter::ReportContext(const Context& context) {
   PrintBasicContext(&GetErrorStream(), context);