diff --git a/lang/basic/lib/build.lua b/lang/basic/lib/build.lua
index 71710a542..cff3b57ca 100644
--- a/lang/basic/lib/build.lua
+++ b/lang/basic/lib/build.lua
@@ -10,8 +10,8 @@ for _, plat in ipairs(vars.plats) do
 		hdrs = {}, -- must be empty
 		deps = {
 			"h+emheaders",
-			"lang/cem/libcc.ansi/headers+headers",
-			"plat/"..plat.."/include+headers",
+			"lang/cem/libcc.ansi/headers+pkg",
+			"plat/"..plat.."/include+pkg",
 		},
         vars = { plat = plat }
     }
diff --git a/lang/cem/libcc.ansi/build.lua b/lang/cem/libcc.ansi/build.lua
index 601a50de4..20591f803 100644
--- a/lang/cem/libcc.ansi/build.lua
+++ b/lang/cem/libcc.ansi/build.lua
@@ -51,8 +51,8 @@ for _, plat in ipairs(vars.plats) do
 		},
 		hdrs = {}, -- must be empty
 		deps = {
-			"lang/cem/libcc.ansi/headers+headers",
-			"plat/"..plat.."/include+headers",
+			"lang/cem/libcc.ansi/headers+pkg",
+			"plat/"..plat.."/include+pkg",
 			"./malloc/malloc.h",
 			"./math/localmath.h",
 			"./stdio/loc_incl.h",
diff --git a/lang/m2/libm2/build.lua b/lang/m2/libm2/build.lua
index d0861b966..a1a9e5c0a 100644
--- a/lang/m2/libm2/build.lua
+++ b/lang/m2/libm2/build.lua
@@ -29,8 +29,8 @@ for _, plat in ipairs(vars.plats) do
         },
 		hdrs = {}, -- must be empty
 		deps = {
-			"lang/cem/libcc.ansi/headers+headers",
-			"plat/"..plat.."/include+headers",
+			"lang/cem/libcc.ansi/headers+pkg",
+			"plat/"..plat.."/include+pkg",
 			"h+emheaders",
 		},
         vars = { plat = plat }
diff --git a/lang/pc/libpc/build.lua b/lang/pc/libpc/build.lua
index 7845991e5..215f0c745 100644
--- a/lang/pc/libpc/build.lua
+++ b/lang/pc/libpc/build.lua
@@ -17,8 +17,8 @@ for _, plat in ipairs(vars.plats) do
         },
 		hdrs = {}, -- must be empty
 		deps = {
-			"lang/cem/libcc.ansi/headers+headers",
-			"plat/"..plat.."/include+headers",
+			"lang/cem/libcc.ansi/headers+pkg",
+			"plat/"..plat.."/include+pkg",
 			"h+emheaders",
 		},
         vars = { plat = plat }
diff --git a/plat/osx386/include/build.lua b/plat/osx386/include/build.lua
index 2f80c1257..c2a1050c2 100644
--- a/plat/osx386/include/build.lua
+++ b/plat/osx386/include/build.lua
@@ -1,4 +1,4 @@
 installable {
-	name = "headers",
+	name = "pkg",
 	map = { "plat/osx/include+pkg" }
 }
diff --git a/plat/osx386/libsys/build.lua b/plat/osx386/libsys/build.lua
index b3a04c8e7..23e491f7a 100644
--- a/plat/osx386/libsys/build.lua
+++ b/plat/osx386/libsys/build.lua
@@ -27,7 +27,7 @@ acklibrary {
 	},
 	deps = {
 		"lang/cem/libcc.ansi/headers+headers",
-		"plat/osx386/include+headers",
+		"plat/osx386/include+pkg",
 	},
 	vars = {
 		plat = "osx386"
diff --git a/plat/osxppc/include/build.lua b/plat/osxppc/include/build.lua
index 2058eb2cc..0fe204ece 100644
--- a/plat/osxppc/include/build.lua
+++ b/plat/osxppc/include/build.lua
@@ -1,4 +1,4 @@
 installable {
-	name = "headers",
+	name = "pkg",
 	map = { "plat/osx/include+pkg" }
 }
\ No newline at end of file
diff --git a/plat/osxppc/libsys/build.lua b/plat/osxppc/libsys/build.lua
index 2accf6eb7..072730b7a 100644
--- a/plat/osxppc/libsys/build.lua
+++ b/plat/osxppc/libsys/build.lua
@@ -27,7 +27,7 @@ acklibrary {
 	},
 	deps = {
 		"lang/cem/libcc.ansi/headers+headers",
-		"plat/osxppc/include+headers",
+		"plat/osxppc/include+pkg",
 	},
 	vars = {
 		plat = "osxppc"