diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 6999747d6d3..084e2fb7db0 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -124,40 +124,44 @@ include $(topsrcdir)/config/config.mk
 
 # Ensure that this happens before including rules.mk
 ifdef ENABLE_INTL_API
-ifndef MOZ_NATIVE_ICU
-ifdef MOZ_SHARED_ICU
-ifeq ($(OS_ARCH),WINNT)
+  ifndef MOZ_NATIVE_ICU
   # Library names: On Windows, ICU uses modified library names for static
   # and debug libraries.
-  ifdef MOZ_DEBUG
-    ICU_LIB_SUFFIX=d
-  endif
-  ifdef JS_SHARED_LIBRARY
-    ICU_FILES := $(foreach libname,$(ICU_LIB_NAMES),intl/icu/target/lib/$(libname)$(ICU_LIB_SUFFIX)$(MOZ_ICU_VERSION).dll)
-  else
-    ICU_LIB_RENAME = $(foreach libname,$(ICU_LIB_NAMES),\
-                       cp -p intl/icu/target/lib/s$(libname)$(ICU_LIB_SUFFIX).lib intl/icu/target/lib/$(libname).lib;)
-  endif
-else
-  ifeq ($(OS_ARCH),Darwin)
-    ifdef JS_SHARED_LIBRARY
-      ICU_FILES := $(foreach libname,$(ICU_LIB_NAMES),intl/icu/target/lib/$(DLL_PREFIX)$(libname).$(MOZ_ICU_VERSION)$(DLL_SUFFIX))
-    endif
-  else
-    ifdef JS_SHARED_LIBRARY
-      ICU_FILES := $(foreach libname,$(ICU_LIB_NAMES),intl/icu/target/lib/$(DLL_PREFIX)$(libname)$(DLL_SUFFIX).$(MOZ_ICU_VERSION))
-    endif
-  endif
-endif
-ifdef ICU_FILES
-  ICU_DEST := $(DIST)/bin
-  INSTALL_TARGETS += ICU
-  $(ICU_FILES): buildicu
-  ICU_TARGET := $(if $(MOZ_PSEUDO_DERECURSE),compile,export)
-endif
-endif
-endif
-endif
+    ifeq ($(OS_ARCH),WINNT)
+      ifdef MOZ_DEBUG
+        ICU_LIB_SUFFIX=d
+      endif
+    endif # WINNT
+    ifdef MOZ_SHARED_ICU
+      ifeq ($(OS_ARCH),WINNT)
+        ifdef JS_SHARED_LIBRARY
+          ICU_FILES := $(foreach libname,$(ICU_LIB_NAMES),intl/icu/target/lib/$(libname)$(ICU_LIB_SUFFIX)$(MOZ_ICU_VERSION).dll)
+        endif
+      else # ! WINNT
+        ifeq ($(OS_ARCH),Darwin)
+          ifdef JS_SHARED_LIBRARY
+            ICU_FILES := $(foreach libname,$(ICU_LIB_NAMES),intl/icu/target/lib/$(DLL_PREFIX)$(libname).$(MOZ_ICU_VERSION)$(DLL_SUFFIX))
+          endif
+        else # ! Darwin
+          ifdef JS_SHARED_LIBRARY
+            ICU_FILES := $(foreach libname,$(ICU_LIB_NAMES),intl/icu/target/lib/$(DLL_PREFIX)$(libname)$(DLL_SUFFIX).$(MOZ_ICU_VERSION))
+          endif
+        endif
+      endif # WINNT
+      ifdef ICU_FILES
+        ICU_DEST := $(DIST)/bin
+        INSTALL_TARGETS += ICU
+        $(ICU_FILES): buildicu
+        ICU_TARGET := $(if $(MOZ_PSEUDO_DERECURSE),compile,export)
+      endif
+    else # !MOZ_SHARED_ICU
+      ifeq ($(OS_ARCH),WINNT)
+        ICU_LIB_RENAME = $(foreach libname,$(ICU_LIB_NAMES),\
+                             cp -p intl/icu/target/lib/s$(libname)$(ICU_LIB_SUFFIX).lib intl/icu/target/lib/$(libname).lib;)
+      endif
+    endif # MOZ_SHARED_ICU
+  endif # !MOZ_NATIVE_ICU
+endif # ENABLE_INTL_API
 
 include $(topsrcdir)/config/rules.mk
 
@@ -196,6 +200,7 @@ ifdef ENABLE_INTL_API
 ifndef MOZ_NATIVE_ICU
 
 ifdef _MSC_VER
+ifdef MOZ_SHARED_ICU
 OS_LIBS += $(call EXPAND_LIBNAME,delayimp)
 ifdef MOZ_DEBUG
 EXTRA_DSO_LDOPTS += \
@@ -211,6 +216,7 @@ EXTRA_DSO_LDOPTS += \
   $(NULL)
 endif
 endif
+endif
 
 ifdef .PYMAKE
 ICU_MAKE = $(GMAKE)