diff --git a/tools/binpac/src/CMakeLists.txt b/tools/binpac/src/CMakeLists.txt
index f239f64a9b..74920f3ea8 100644
--- a/tools/binpac/src/CMakeLists.txt
+++ b/tools/binpac/src/CMakeLists.txt
@@ -106,7 +106,7 @@ set(binpac_SRCS
 add_executable(binpac ${binpac_SRCS})
 
 if ( MSVC )
-    target_link_libraries(binpac PRIVATE zeek_windows)
+    target_link_libraries(binpac PRIVATE libunistd)
 endif()
 
 install(TARGETS binpac DESTINATION bin)
diff --git a/tools/binpac/src/pac_scan.ll b/tools/binpac/src/pac_scan.ll
index b6e6fa3b58..449403d76d 100644
--- a/tools/binpac/src/pac_scan.ll
+++ b/tools/binpac/src/pac_scan.ll
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <string_view>
 
-#ifdef MSVC
+#ifdef _MSC_VER
 #include <filesystem>
 #else
 #include <libgen.h>
@@ -52,8 +52,8 @@ void include_file(const char *filename);
 
 std::string do_dirname(std::string_view s)
 	{
-#ifdef MSVC
-	return std::filesystem::path(path).parent_path().string();
+#ifdef _MSC_VER
+	return std::filesystem::path(s).parent_path().string();
 #else
 	std::unique_ptr<char[]> tmp{new char[s.size()+1]};
 	strncpy(tmp.get(), s.data(), s.size());