diff --git a/Jamfile b/Jamfile
index 555360b1df..0ff2b8c4ba 100644
--- a/Jamfile
+++ b/Jamfile
@@ -22,15 +22,15 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 AddHaikuImageSystemPackages [ FFilterByBuildFeatures
 	bash bc freetype zlib
 
-	!gcc2 @{ coreutils icu74 }@
-	gcc2 @{ coreutils_x86 icu icu74_x86@secondary_x86 }@
+	!gcc2 @{ coreutils icu74 wget }@
+	gcc2 @{ coreutils_x86 wget_x86 icu icu74_x86@secondary_x86 }@
 	regular_image @{
 		bzip2 expat ffmpeg6 glu gutenprint9 gzip
 		lame less libedit libicns
 		mesa mesa_devel mesa_swpipe@!gcc2 mesa_swrast@gcc2
 		netcat
 		sed sharutils
-		unzip wget which zip
+		unzip which zip
 
 		!gcc2 @{ diffutils findutils gawk grep tar tcpdump zstd }@
 		gcc2 @{
diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index caeb24072c..dad4a0d705 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -155,6 +155,7 @@ rule ArchitectureSetup architecture
 
 	if $(HAIKU_CC_IS_LEGACY_GCC_$(architecture)) = 1 {
 		HAIKU_DEFINES_$(architecture) += _BEOS_R5_COMPATIBLE_ ;
+		HAIKU_WERROR_FLAGS_$(architecture) += -Wno-unknown-pragmas ;
 	}
 
 	# private shared kernel/libroot headers
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 43ae73bc6f..11b63c579e 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -129,8 +129,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ]
 
 # Git
 if [ IsOptionalHaikuImagePackageAdded Git ] {
-	AddHaikuImageSystemPackages git git_daemon perl ;
-	AddHaikuImageSourcePackages git ;
+	AddHaikuImageSystemPackages git@!gcc2 git_x86@secondary_x86 ;
+	AddHaikuImageSourcePackages git@!gcc2 git_x86@secondary_x86 ;
 }
 
 
diff --git a/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp b/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
index 975a152da8..1b4eb635f5 100644
--- a/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
+++ b/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
@@ -461,15 +461,22 @@ write_rgba32b(jas_matrix_t** pixels, uchar* scanline, int width)
 //	#pragma mark -	jasper I/O
 
 
+#if __GNUC__ == 2
+typedef int jasper_length_t;
+#else
+typedef unsigned int jasper_length_t;
+#endif
+
+
 static int
-Read(jas_stream_obj_t* object, char* buffer, const unsigned int length)
+Read(jas_stream_obj_t* object, char* buffer, const jasper_length_t length)
 {
 	return (*(BPositionIO**)object)->Read(buffer, length);
 }
 
 
 static int
-Write(jas_stream_obj_t* object, const char* buffer, const unsigned int length)
+Write(jas_stream_obj_t* object, const char* buffer, const jasper_length_t length)
 {
 	return (*(BPositionIO**)object)->Write(buffer, length);
 }
diff --git a/src/data/package_infos/x86/haiku_secondary b/src/data/package_infos/x86/haiku_secondary
index 95d2c35a76..5fd15f51ef 100644
--- a/src/data/package_infos/x86/haiku_secondary
+++ b/src/data/package_infos/x86/haiku_secondary
@@ -33,7 +33,7 @@ requires {
 	lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0
-	lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.2
+	lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH%
 #endif
 	lib:libz_%HAIKU_SECONDARY_PACKAGING_ARCH%
diff --git a/src/data/package_infos/x86_gcc2/haiku_secondary b/src/data/package_infos/x86_gcc2/haiku_secondary
index aced659df6..a810c66a82 100644
--- a/src/data/package_infos/x86_gcc2/haiku_secondary
+++ b/src/data/package_infos/x86_gcc2/haiku_secondary
@@ -33,7 +33,7 @@ requires {
 	lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libpng16_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0
-	lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.6
+	lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH%
 
 	lib:libavcodec_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 60