diff --git a/src/kiwi/base/files/file.h b/src/kiwi/base/files/file.h
index f9914299..29063c3d 100644
--- a/src/kiwi/base/files/file.h
+++ b/src/kiwi/base/files/file.h
@@ -32,7 +32,7 @@ typedef struct stat stat_wrapper_t;
 }
 #elif BUILDFLAG(IS_POSIX)
 struct stat64;
-namespace base {
+namespace kiwi::base {
 typedef struct stat64 stat_wrapper_t;
 }
 #endif
diff --git a/src/kiwi/base/files/file_enumerator_win.cc b/src/kiwi/base/files/file_enumerator_win.cc
index 975589a9..f7681dfe 100644
--- a/src/kiwi/base/files/file_enumerator_win.cc
+++ b/src/kiwi/base/files/file_enumerator_win.cc
@@ -12,6 +12,10 @@
 #include "base/win/shlwapi.h"
 #include "base/win/windows_types.h"
 
+#ifdef _MSC_VER
+#pragma comment(lib, "Shlwapi.lib")
+#endif
+
 #if defined(max)
 #undef max
 #endif
diff --git a/src/kiwi/third_party/CMakeLists.txt b/src/kiwi/third_party/CMakeLists.txt
index 324ab24b..f7ce0e71 100644
--- a/src/kiwi/third_party/CMakeLists.txt
+++ b/src/kiwi/third_party/CMakeLists.txt
@@ -10,6 +10,8 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+set (CMAKE_POSITION_INDEPENDENT_CODE ON)
+
 add_subdirectory(glog)
 add_subdirectory(SDL2)
 add_subdirectory(nes_apu)