diff --git a/builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj b/builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj
index e572201d..68a94d2c 100644
--- a/builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj
+++ b/builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj
@@ -132,8 +132,12 @@
     <ClCompile Include="..\..\..\..\test\memory\utilities.cpp">
       <ObjectFileName>$(IntDir)test_memory_utilities.obj</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\test\mocks\blocks.cpp" />
-    <ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp" />
+    <ClCompile Include="..\..\..\..\test\mocks\blocks.cpp">
+      <ObjectFileName>$(IntDir)test_mocks_blocks.obj</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp">
+      <ObjectFileName>$(IntDir)test_mocks_chunk_storage.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\primitives\arrayhead.cpp" />
     <ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp" />
     <ClCompile Include="..\..\..\..\test\primitives\hashhead.cpp" />
@@ -178,7 +182,9 @@
     <ClCompile Include="..\..\..\..\test\tables\optional\address.cpp" />
     <ClCompile Include="..\..\..\..\test\tables\optional\filter_bk.cpp" />
     <ClCompile Include="..\..\..\..\test\tables\optional\filter_tx.cpp" />
-    <ClCompile Include="..\..\..\..\test\test.cpp" />
+    <ClCompile Include="..\..\..\..\test\test.cpp">
+      <ObjectFileName>$(IntDir)test_test.obj</ObjectFileName>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\test\mocks\blocks.hpp" />
diff --git a/builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj b/builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj
index c800e74c..101acf5a 100644
--- a/builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj
+++ b/builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj
@@ -130,7 +130,9 @@
     <ClCompile Include="..\..\..\..\src\locks\flush_lock.cpp" />
     <ClCompile Include="..\..\..\..\src\locks\interprocess_lock.cpp" />
     <ClCompile Include="..\..\..\..\src\memory\map.cpp" />
-    <ClCompile Include="..\..\..\..\src\memory\mman-win32\mman.cpp" />
+    <ClCompile Include="..\..\..\..\src\memory\mman-win32\mman.cpp">
+      <ObjectFileName>$(IntDir)src_memory_mman-win32_mman.obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\src\memory\utilities.cpp">
       <ObjectFileName>$(IntDir)src_memory_utilities.obj</ObjectFileName>
     </ClCompile>
diff --git a/configure.ac b/configure.ac
index 5edb19f1..a9ef6cf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -250,15 +250,13 @@ AS_CASE([${with_tests}], [yes],
 
 # Require bitcoin-system of at least version 4.0.0 and output ${bitcoin_system_CPPFLAGS/LIBS/PKG}.
 #------------------------------------------------------------------------------
-PKG_CHECK_MODULES([bitcoin_system], [libbitcoin-system >= 4.0.0],
-    [bitcoin_system_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin-system >= 4.0.0" 2>/dev/null`"
-     bitcoin_system_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin-system >= 4.0.0" 2>/dev/null`"],
-    [AC_MSG_ERROR([libbitcoin-system >= 4.0.0 is required but was not found.])])
+PKG_CHECK_MODULES([bitcoin_system], [libbitcoin-system >= 4.0.0], [],
+    [
+      AC_MSG_ERROR([libbitcoin-system >= 4.0.0 is required but was not found.])
+    ])
 AC_SUBST([bitcoin_system_PKG], ['libbitcoin-system >= 4.0.0'])
 AC_SUBST([bitcoin_system_CPPFLAGS], [${bitcoin_system_CFLAGS}])
-AS_IF([test x${bitcoin_system_INCLUDEDIR} != "x"],
-    [AC_SUBST([bitcoin_system_ISYS_CPPFLAGS], ["-isystem${bitcoin_system_INCLUDEDIR} ${bitcoin_system_OTHER_CFLAGS}"])],
-    [AC_SUBST([bitcoin_system_ISYS_CPPFLAGS], [${bitcoin_system_OTHER_CFLAGS}])])
+AC_SUBST([bitcoin_system_ISYS_CPPFLAGS], [`echo ${bitcoin_system_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`]])
 AC_MSG_NOTICE([bitcoin_system_CPPFLAGS : ${bitcoin_system_CPPFLAGS}])
 AC_MSG_NOTICE([bitcoin_system_ISYS_CPPFLAGS : ${bitcoin_system_ISYS_CPPFLAGS}])
 AC_MSG_NOTICE([bitcoin_system_OTHER_CFLAGS : ${bitcoin_system_OTHER_CFLAGS}])
diff --git a/libbitcoin-database.pc.in b/libbitcoin-database.pc.in
index ae8c6eb3..1044ee93 100644
--- a/libbitcoin-database.pc.in
+++ b/libbitcoin-database.pc.in
@@ -12,7 +12,6 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-
 # Metadata
 #==============================================================================
 Name: libbitcoin-database