diff --git a/tools/bifcl/CMakeLists.txt b/tools/bifcl/CMakeLists.txt
index abe34bb950..75929d0f13 100644
--- a/tools/bifcl/CMakeLists.txt
+++ b/tools/bifcl/CMakeLists.txt
@@ -53,7 +53,7 @@ set(bifcl_SRCS
 add_executable(bifcl ${bifcl_SRCS})
 
 if (MSVC)
-    target_link_libraries(bifcl PRIVATE zeek_windows)
+    target_link_libraries(bifcl PRIVATE libunistd)
 endif()
 
 install(TARGETS bifcl DESTINATION bin)
diff --git a/tools/bifcl/builtin-func.l b/tools/bifcl/builtin-func.l
index b6464ecd36..4eb0b5fcca 100644
--- a/tools/bifcl/builtin-func.l
+++ b/tools/bifcl/builtin-func.l
@@ -332,7 +332,7 @@ int main(int argc, char* argv[])
 		switch ( opt ) {
 		case 'p':
 			alternative_mode = 1;
-			plugin = optarg;
+			plugin = (char*) optarg;
 			break;
 
 		case 's':
@@ -392,13 +392,17 @@ int main(int argc, char* argv[])
 		else
 			init_alternative_mode();
 
+		fprintf(fp_netvar_init, "#ifdef __GNUC__\n");
 		fprintf(fp_netvar_init, "#pragma GCC diagnostic push\n");
 		fprintf(fp_netvar_init, "#pragma GCC diagnostic ignored \"-Wdeprecated-declarations\"\n\n");
-
+		fprintf(fp_netvar_init, "#endif\n");
+		
 		yy_switch_to_buffer(yy_create_buffer(fp_input, YY_BUF_SIZE));
 		yyparse();
 
+		fprintf(fp_netvar_init, "#ifdef __GNUC__\n");
 		fprintf(fp_netvar_init, "\n\n#pragma GCC diagnostic pop\n");
+		fprintf(fp_netvar_init, "#endif\n");
 
 		if ( alternative_mode )
 			finish_alternative_mode();