diff --git a/osquery/tables/system/windows/logged_in_users.cpp b/osquery/tables/system/windows/logged_in_users.cpp
index 142ba0d3bc8..ed721160cea 100644
--- a/osquery/tables/system/windows/logged_in_users.cpp
+++ b/osquery/tables/system/windows/logged_in_users.cpp
@@ -21,6 +21,10 @@
 #include <osquery/utils/conversions/windows/windows_time.h>
 #include <osquery/utils/system/windows/users_groups_helpers.h>
 
+namespace osquery {
+namespace tables {
+
+namespace {
 const std::map<int, std::string> kSessionStates = {
     {WTSActive, "active"},
     {WTSDisconnected, "disconnected"},
@@ -32,9 +36,7 @@ const std::map<int, std::string> kSessionStates = {
     {WTSReset, "reset"},
     {WTSDown, "down"},
     {WTSInit, "init"}};
-
-namespace osquery {
-namespace tables {
+} // namespace
 
 QueryData genLoggedInUsers(QueryContext& context) {
   QueryData results;
@@ -179,3 +181,4 @@ QueryData genLoggedInUsers(QueryContext& context) {
 }
 } // namespace tables
 } // namespace osquery
+
diff --git a/osquery/utils/windows/shellitem.cpp b/osquery/utils/windows/shellitem.cpp
index ddd0aef6b7d..fd51b833f9d 100644
--- a/osquery/utils/windows/shellitem.cpp
+++ b/osquery/utils/windows/shellitem.cpp
@@ -19,6 +19,8 @@
 #include <string>
 #include <vector>
 
+namespace osquery {
+
 const std::string kNetworkShareIds[6] = {"41", "42", "46", "47", "4C", "C3"};
 
 // Property set GUIDs associated with name entries
@@ -37,7 +39,7 @@ const std::string kPropertySets[15] = {"000214A1-0000-0000-C000-000000000046",
                                        "D5CDD505-2E9C-101B-9397-08002B2CF9AE",
                                        "EF6B490D-5CD8-437A-AFFC-DA8B60EE4A3C",
                                        "F29F85E0-4FF9-1068-AB91-08002B27B3D9"};
-namespace osquery {
+
 std::string guidParse(const std::string& guid_little) {
   std::vector<std::string> guids;
   guids.push_back(guid_little.substr(0, 8));
@@ -487,4 +489,4 @@ std::string mtpRoot(const std::string& shell_data) {
   }
   return name;
 }
-} // namespace osquery
\ No newline at end of file
+} // namespace osquery