10 files changed, 16 insertions, 5 deletions
diff --git a/src/common/SubProcess_win32.cc b/src/common/win32/SubProcess.cc
index 0e4d13dd71a..565cb47f0fa 100644
--- a/src/common/SubProcess_win32.cc
+++ b/src/common/win32/SubProcess.cc
@@ -1,4 +1,14 @@
-#include "SubProcess.h"
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2020 SUSE LINUX GmbH
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation.  See file COPYING.
+ *
+ */
 
 #include <stdarg.h>
 #include <fcntl.h>
@@ -6,6 +16,7 @@
 #include <iostream>
 #include <iomanip>
 
+#include "common/SubProcess.h"
 #include "common/errno.h"
 #include "include/ceph_assert.h"
 #include "include/compat.h"
diff --git a/src/common/blkdev_win32.cc b/src/common/win32/blkdev.cc
index c3e28e343ff..bb815a044fc 100644
--- a/src/common/blkdev_win32.cc
+++ b/src/common/win32/blkdev.cc
@@ -13,7 +13,7 @@
  */
 
 #include <errno.h>
-#include "blkdev.h"
+#include "common/blkdev.h"
 
 int get_device_by_path(const char *path, char* partition, char* device,
                size_t max)
diff --git a/src/common/dlfcn_win32.cc b/src/common/win32/dlfcn.cc
index 329d14677bd..329d14677bd 100644
--- a/src/common/dlfcn_win32.cc
+++ b/src/common/win32/dlfcn.cc
diff --git a/src/common/dns_resolve_win32.cc b/src/common/win32/dns_resolve.cc
index b7a888b30eb..8a7c80bff04 100644
--- a/src/common/dns_resolve_win32.cc
+++ b/src/common/win32/dns_resolve.cc
@@ -13,7 +13,7 @@
  */
 
 #include "include/scope_guard.h"
-#include "dns_resolve.h"
+#include "common/dns_resolve.h"
 #include "common/debug.h"
 
 #define dout_subsys ceph_subsys_
diff --git a/src/common/win32_errno.cc b/src/common/win32/errno.cc
index 25753779d01..25753779d01 100644
--- a/src/common/win32_errno.cc
+++ b/src/common/win32/errno.cc
diff --git a/src/common/ifaddrs_win32.cc b/src/common/win32/ifaddrs.cc
index d7de4a5ff8a..d7de4a5ff8a 100644
--- a/src/common/ifaddrs_win32.cc
+++ b/src/common/win32/ifaddrs.cc
diff --git a/src/common/registry_win32.cc b/src/common/win32/registry.cc
index eb809a40f79..d032e3b602a 100644
--- a/src/common/registry_win32.cc
+++ b/src/common/win32/registry.cc
@@ -15,7 +15,7 @@
 
 #include "common/debug.h"
 #include "common/errno.h"
-#include "common/registry_win32.h"
+#include "common/win32/registry.h"
 
 RegistryKey::RegistryKey(CephContext *cct_, HKEY hRootKey, LPCTSTR strKey,
                          bool create_value): cct(cct_)
diff --git a/src/common/registry_win32.h b/src/common/win32/registry.h
index 974d662de2d..974d662de2d 100644
--- a/src/common/registry_win32.h
+++ b/src/common/win32/registry.h
diff --git a/src/common/service_win32.cc b/src/common/win32/service.cc
index 6297531d3de..df0e834137c 100644
--- a/src/common/service_win32.cc
+++ b/src/common/win32/service.cc
@@ -15,7 +15,7 @@
 
 #include "common/debug.h"
 #include "common/errno.h"
-#include "common/service_win32.h"
+#include "common/win32/service.h"
 
 // Initialize the singleton service instance.
 ServiceBase *ServiceBase::s_service = NULL;
diff --git a/src/common/service_win32.h b/src/common/win32/service.h
index 5adcdea223f..5adcdea223f 100644
--- a/src/common/service_win32.h
+++ b/src/common/win32/service.h