diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c2f21a07a696..652e948ad407 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -89,9 +89,12 @@ endif
 
 ifeq ($(SYSTEM_NPAPI_HEADERS),YES)
 
+# yes this uses internal headers too...
+# they are split across 2 dirs for this reason
 define gb_LinkTarget__use_npapi_headers
 $(call gb_LinkTarget_set_include,$(1),\
 	$(NPAPI_HEADERS_CFLAGS) \
+	-I$(SRCDIR)/np_sdk \
 	$$(INCLUDE) \
 )
 
@@ -100,9 +103,9 @@ endef
 else #!SYSTEM_NPAPI_HEADERS
 
 define gb_LinkTarget__use_npapi_headers
-$(call gb_LinkTarget_use_package,$(1),npapi)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(OUTDIR)/inc/external/npsdk \
+	-I$(SRCDIR)/np_sdk/inc \
+	-I$(SRCDIR)/np_sdk \
 	$$(INCLUDE) \
 )
 
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index b74d6baaa9fd..90d4880f2f6b 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -11,10 +11,6 @@
 
 $(eval $(call gb_Library_Library,npsoplugin))
 
-$(eval $(call gb_Library_use_packages,npsoplugin,\
-	np_sdk_inc \
-))
-
 $(eval $(call gb_Library_use_externals,npsoplugin,\
     boost_headers \
     npapi_headers \
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index bae1bbfddcaf..3970fdf80719 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -13,8 +13,6 @@ $(eval $(call gb_Library_Library,pl))
 
 $(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl))
 
-$(eval $(call gb_Library_use_package,pl,np_sdk_inc))
-
 $(eval $(call gb_Library_use_externals,pl,\
 	boost_headers \
 	npapi_headers \
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk
index deb62a834a36..13d2c057ff30 100644
--- a/extensions/StaticLibrary_plugcon.mk
+++ b/extensions/StaticLibrary_plugcon.mk
@@ -14,10 +14,6 @@ endif
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,plugcon))
 
-$(eval $(call gb_StaticLibrary_use_packages,plugcon,\
-    np_sdk_inc \
-))
-
 $(eval $(call gb_StaticLibrary_use_externals,plugcon,\
     boost_headers \
     npapi_headers \
diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk
index b698e03e85c8..5d82712d0d8a 100644
--- a/np_sdk/Module_np_sdk.mk
+++ b/np_sdk/Module_np_sdk.mk
@@ -12,16 +12,6 @@ $(eval $(call gb_Module_Module,np_sdk))
 
 ifneq (,$(filter YES,$(ENABLE_NPAPI_FROM_BROWSER) $(ENABLE_NPAPI_INTO_BROWSER)))
 
-$(eval $(call gb_Module_add_targets,np_sdk,\
-	Package_inc \
-))
-
-ifeq ($(SYSTEM_NPAPI_HEADERS),NO)
-$(eval $(call gb_Module_add_targets,np_sdk,\
-	Package_npapi \
-))
-endif
-
 ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES)
 $(eval $(call gb_Module_add_targets,np_sdk,\
 	StaticLibrary_nputils \
diff --git a/np_sdk/Package_inc.mk b/np_sdk/Package_inc.mk
deleted file mode 100644
index 9f4d857fdf9b..000000000000
--- a/np_sdk/Package_inc.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,np_sdk_inc,$(SRCDIR)/np_sdk))
-
-$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/jri.h,mozsrc/jri.h))
-$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/jri_md.h,mozsrc/jri_md.h))
-$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/jritypes.h,mozsrc/jritypes.h))
-$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/npupp.h,mozsrc/npupp.h))
-$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/plugin.h,mozsrc/plugin.h))
-
-# vim: set noet sw=4 ts=4:
diff --git a/np_sdk/Package_npapi.mk b/np_sdk/Package_npapi.mk
deleted file mode 100644
index 6737a49344c5..000000000000
--- a/np_sdk/Package_npapi.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,npapi,$(SRCDIR)/np_sdk))
-
-$(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/npapi.h,inc/npapi.h))
-$(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/npfunctions.h,inc/npfunctions.h))
-$(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/npruntime.h,inc/npruntime.h))
-$(eval $(call gb_Package_add_file,npapi,inc/external/npsdk/nptypes.h,inc/nptypes.h))
-
-# vim: set noet sw=4 ts=4:
diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk
index b85eaa0ee5d9..3ff331475e2b 100644
--- a/np_sdk/StaticLibrary_nputils.mk
+++ b/np_sdk/StaticLibrary_nputils.mk
@@ -22,11 +22,11 @@ endif
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_StaticLibrary_add_exception_objects,nputils,\
-	np_sdk/mozsrc/npwin \
+	np_sdk/npsdk/npwin \
 ))
 else
 $(eval $(call gb_StaticLibrary_add_cobjects,nputils,\
-	np_sdk/mozsrc/npunix \
+	np_sdk/npsdk/npunix \
 ))
 endif
 
diff --git a/np_sdk/mozsrc/LEGAL b/np_sdk/npsdk/LEGAL
similarity index 100%
rename from np_sdk/mozsrc/LEGAL
rename to np_sdk/npsdk/LEGAL
diff --git a/np_sdk/mozsrc/LICENSE b/np_sdk/npsdk/LICENSE
similarity index 100%
rename from np_sdk/mozsrc/LICENSE
rename to np_sdk/npsdk/LICENSE
diff --git a/np_sdk/mozsrc/README b/np_sdk/npsdk/README
similarity index 100%
rename from np_sdk/mozsrc/README
rename to np_sdk/npsdk/README
diff --git a/np_sdk/mozsrc/jri.h b/np_sdk/npsdk/jri.h
similarity index 100%
rename from np_sdk/mozsrc/jri.h
rename to np_sdk/npsdk/jri.h
diff --git a/np_sdk/mozsrc/jri_md.h b/np_sdk/npsdk/jri_md.h
similarity index 100%
rename from np_sdk/mozsrc/jri_md.h
rename to np_sdk/npsdk/jri_md.h
diff --git a/np_sdk/mozsrc/jritypes.h b/np_sdk/npsdk/jritypes.h
similarity index 100%
rename from np_sdk/mozsrc/jritypes.h
rename to np_sdk/npsdk/jritypes.h
diff --git a/np_sdk/mozsrc/npunix.c b/np_sdk/npsdk/npunix.c
similarity index 100%
rename from np_sdk/mozsrc/npunix.c
rename to np_sdk/npsdk/npunix.c
diff --git a/np_sdk/mozsrc/npupp.h b/np_sdk/npsdk/npupp.h
similarity index 100%
rename from np_sdk/mozsrc/npupp.h
rename to np_sdk/npsdk/npupp.h
diff --git a/np_sdk/mozsrc/npwin.cxx b/np_sdk/npsdk/npwin.cxx
similarity index 100%
rename from np_sdk/mozsrc/npwin.cxx
rename to np_sdk/npsdk/npwin.cxx
diff --git a/np_sdk/mozsrc/plugin.h b/np_sdk/npsdk/plugin.h
similarity index 94%
rename from np_sdk/mozsrc/plugin.h
rename to np_sdk/npsdk/plugin.h
index 67e049e4b5f6..ec0dc040538c 100644
--- a/np_sdk/mozsrc/plugin.h
+++ b/np_sdk/npsdk/plugin.h
@@ -23,7 +23,7 @@
 #include "npapi.h"
 
 /* OpenOffice.org/LibreOffice modified the implementations of NP_Initialize and
-   NP_Shutdown in np_sdk/mozsrc/ to call NPP_Initialize and NPP_Shutdown, resp.,
+   NP_Shutdown in np_sdk/npsdk/ to call NPP_Initialize and NPP_Shutdown, resp.,
    defined in extensions/source/nsplugin/source/npshell.cxx:
 */