5 files changed, 32 insertions, 12 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d4e442687c2d..927a123e9ace 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -125,6 +125,26 @@ endef
 
 endif
 
+ifeq ($(OS)$(COM),WNTMSC)
+
+define gb_ExternalProject__use_unistd_headers
+$(call gb_ExternalProject_use_package,$(1),soltools_inc)
+
+endef
+
+define gb_LinkTarget__use_unistd_headers
+$(call gb_LinkTarget_use_package,$(1),soltools_inc)
+
+endef
+
+else # ! ($(OS)$(COM),WNTMSC)
+
+gb_ExternalProject__use_unistd_headers :=
+
+gb_LinkTarget__use_unistd_headers :=
+
+endif
+
 ifeq ($(SYSTEM_VIGRA),YES)
 
 gb_LinkTarget__use_vigra_headers :=
diff --git a/idlc/Executable_idlc.mk b/idlc/Executable_idlc.mk
index 57caed7e20ca..25d2bbd108b0 100644
--- a/idlc/Executable_idlc.mk
+++ b/idlc/Executable_idlc.mk
@@ -32,7 +32,10 @@ $(eval $(call gb_Executable_set_include,idlc,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Executable_use_external,idlc,boost_headers))
+$(eval $(call gb_Executable_use_externals,idlc,\
+	boost_headers \
+	unistd_headers \
+))
 
 $(eval $(call gb_Executable_use_libraries,idlc,\
     reg \
@@ -40,8 +43,6 @@ $(eval $(call gb_Executable_use_libraries,idlc,\
     salhelper \
 ))
 
-$(eval $(call gb_Executable_use_package,idlc,soltools_inc))
-
 $(eval $(call gb_Executable_add_grammars,idlc,\
     idlc/source/parser \
 ))
diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk
index 82bf7d49683d..c853d89ddcf1 100644
--- a/nss/ExternalProject_nss.mk
+++ b/nss/ExternalProject_nss.mk
@@ -11,8 +11,9 @@ $(eval $(call gb_ExternalProject_ExternalProject,nss))
 
 $(eval $(call gb_ExternalProject_use_unpacked,nss,nss))
 
-$(eval $(call gb_ExternalProject_use_package,nss,soltools_inc))
-
+$(eval $(call gb_ExternalProject_use_externals,nss,\
+	unistd_headers \
+))
 
 $(eval $(call gb_ExternalProject_register_targets,nss,\
 	configure \
diff --git a/soltools/Executable_cpp.mk b/soltools/Executable_cpp.mk
index 0b9b3ea2f0ac..f24b0185fd32 100644
--- a/soltools/Executable_cpp.mk
+++ b/soltools/Executable_cpp.mk
@@ -9,11 +9,9 @@
 
 $(eval $(call gb_Executable_Executable,cpp))
 
-ifeq ($(COM),MSC)
-$(eval $(call gb_Executable_use_packages,cpp,\
-    soltools_inc \
+$(eval $(call gb_Executable_use_externals,cpp,\
+    unistd_headers \
 ))
-endif
 
 $(eval $(call gb_Executable_add_cobjects,cpp,\
     soltools/cpp/_cpp \
diff --git a/soltools/Executable_makedepend.mk b/soltools/Executable_makedepend.mk
index 8f74a3ff2f6d..e924a8d0fec6 100644
--- a/soltools/Executable_makedepend.mk
+++ b/soltools/Executable_makedepend.mk
@@ -19,11 +19,11 @@ $(eval $(call gb_Executable_add_defs,makedepend,\
     -DHW_THREADS \
 ))
 
-ifeq ($(COM),MSC)
-$(eval $(call gb_Executable_use_packages,makedepend,\
-    soltools_inc \
+$(eval $(call gb_Executable_use_externals,makedepend,\
+	unistd_headers \
 ))
 
+ifeq ($(COM),MSC)
 $(eval $(call gb_Executable_add_defs,makedepend,\
     -wd4100 \
     -wd4131 \