diff --git a/mozglue/tests/interceptor/moz.build b/mozglue/tests/interceptor/moz.build
index a0f205907263..3305a129e1c5 100644
--- a/mozglue/tests/interceptor/moz.build
+++ b/mozglue/tests/interceptor/moz.build
@@ -16,7 +16,7 @@ OS_LIBS += [
     'ole32',
 ]
 
-if CONFIG['OS_TARGET'] == 'WINNT' and CONFIG['CC_TYPE'] == 'gcc':
+if CONFIG['OS_TARGET'] == 'WINNT' and CONFIG['CC_TYPE'] in ('gcc', 'clang'):
     # This allows us to use wmain as the entry point on mingw
     LDFLAGS += [
         '-municode',
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index d505d7d59e18..0d5b444e83c2 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -312,6 +312,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         'locationapi',
         'sapi',
         'dxguid',
+        'dhcpcsvc',
     ]
     if CONFIG['ACCESSIBILITY']:
         OS_LIBS += [