diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 19c4b2ee64..8ac8ce68a6 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -498,6 +498,9 @@ if [ IsOptionalHaikuImagePackageAdded Development ]
 		AddSymlinkToHaikuImage develop lib x86 : /system/lib/$(lib:BS) ;
 	}
 
+	# static libraries
+	AddFilesToHaikuImage develop lib x86 : libncurses.a ;
+
 	# cc and c++ wrapper scripts
 	AddFilesToHaikuImage beos bin : cc c++ ;
 
@@ -506,6 +509,7 @@ if [ IsOptionalHaikuImagePackageAdded Development ]
 	AddHeaderDirectoryToHaikuImage os ;
 	AddHeaderDirectoryToHaikuImage posix ;
 	AddHeaderDirectoryToHaikuImage build gcc-2.95.3 ;
+		# TODO: Remove when adding gcc.
 
 	# add _G_config.h to posix/
 	SEARCH on <header>_G_config.h = [ FDirName $(HAIKU_TOP) headers glibc ] ;
@@ -514,9 +518,11 @@ if [ IsOptionalHaikuImagePackageAdded Development ]
 	# make be -> os symlink for now
 	AddSymlinkToHaikuImage develop headers : /boot/develop/headers/os : be ;
 
-	# symlink cpp to g++'s headers
-	AddSymlinkToHaikuImage develop headers
-		: /boot/develop/tools/gnupro/include/g++ : cpp ;
+	AddHeaderDirectoryToHaikuImage cpp ;
+	# TODO: This method is the right one for the non-legacy gcc:
+#	# symlink cpp to g++'s headers
+#	AddSymlinkToHaikuImage develop headers
+#		: /boot/develop/tools/gnupro/include/g++ : cpp ;
 }
 
 # Vision