diff --git a/src/apps/deskflow-daemon/deskflow-daemon.cpp b/src/apps/deskflow-daemon/deskflow-daemon.cpp
index 68b3ac2f6..1650b99bb 100644
--- a/src/apps/deskflow-daemon/deskflow-daemon.cpp
+++ b/src/apps/deskflow-daemon/deskflow-daemon.cpp
@@ -6,16 +6,13 @@
  */
 
 #include "arch/Arch.h"
+#include "base/EventQueue.h"
 #include "base/Log.h"
 #include "common/constants.h"
 #include "common/version.h"
 #include "deskflow/DaemonApp.h"
 #include "deskflow/ipc/DaemonIpcServer.h"
 
-#include "arch/Arch.h"
-#include "base/EventQueue.h"
-#include "base/Log.h"
-
 #if SYSAPI_WIN32
 
 #include "arch/win32/ArchMiscWindows.h"
diff --git a/src/lib/common/common.h b/src/lib/common/common.h
index 5912d1b56..9356e73d3 100644
--- a/src/lib/common/common.h
+++ b/src/lib/common/common.h
@@ -41,12 +41,11 @@ enum
   kExitArgs = 3,       // bad arguments
   kExitConfig = 4,     // cannot read configuration
 };
-namespace deskflow::common {
 
 #if WINAPI_MSWINDOWS
+namespace deskflow::common {
 
 const auto kCloseEventName = "Global\\DeskflowClose";
 
+}
 #endif
-
-} // namespace deskflow::common