diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 0b9926ae..6614bcfe 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -88,12 +88,15 @@ jobs:
         jobname: [
           windows2019-vs2019-clang,
           windows2022-vs2022-msvc,
+          windows2022-vs2022-msvc-static,
           macos-clang ]
         include:
         - jobname: windows2019-vs2019-clang
           vm: windows-2019
         - jobname: windows2022-vs2022-msvc
           vm: windows-2022
+        - jobname: windows2022-vs2022-msvc-static
+          vm: windows-2022
         - jobname: macos-clang
           vm: macos-latest
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d8589f9..c413fcd4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -264,6 +264,8 @@ CHECK_INCLUDE_FILE(sys/time.h HAVE_SYS_TIME_H)
 CHECK_INCLUDE_FILE(sys/times.h HAVE_SYS_TIMES_H)
 CHECK_INCLUDE_FILE(sys/uio.h HAVE_SYS_UIO_H)
 CHECK_INCLUDE_FILE(sys/un.h HAVE_SYS_UN_H)
+CHECK_INCLUDE_FILE(netinet/in.h HAVE_NETINET_IN_H)
+CHECK_INCLUDE_FILE(arpa/inet.h HAVE_ARPA_INET_H)
 CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
 CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H)
 CHECK_INCLUDE_FILE(winsock.h HAVE_WINSOCK_H)
diff --git a/fm/fm_formats.c b/fm/fm_formats.c
index 83ff1604..ce945f2f 100755
--- a/fm/fm_formats.c
+++ b/fm/fm_formats.c
@@ -15,6 +15,9 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
 #ifdef HAVE_WINDOWS_H
 #include <winsock.h>
 #endif
diff --git a/scripts/ci/cmake/windows2022-vs2022-msvc-static.cmake b/scripts/ci/cmake/windows2022-vs2022-msvc-static.cmake
new file mode 100644
index 00000000..cdb9e59d
--- /dev/null
+++ b/scripts/ci/cmake/windows2022-vs2022-msvc-static.cmake
@@ -0,0 +1,8 @@
+# Client maintainer: chuck.atkins@kitware.com
+
+set(CTEST_CMAKE_GENERATOR "Visual Studio 17 2022")
+set(CTEST_CMAKE_GENERATOR_PLATFORM x64)
+set(BUILD_SHARED_LIBS off)
+
+list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
+include(${CMAKE_CURRENT_LIST_DIR}/windows-common.cmake)