diff --git a/app-office/libreoffice/libreoffice-24.8.1.1.recipe b/app-office/libreoffice/libreoffice-24.8.1.1.recipe
index 0d1d4f072..ad3515271 100644
--- a/app-office/libreoffice/libreoffice-24.8.1.1.recipe
+++ b/app-office/libreoffice/libreoffice-24.8.1.1.recipe
@@ -187,9 +187,9 @@ done
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	glm${secondaryArchSuffix}_devel
 	unixodbc${secondaryArchSuffix}_devel
 	qt6_tools${secondaryArchSuffix}_devel
-	devel:glm
 	devel:libabw_0.1$secondaryArchSuffix
 	devel:libargon2$secondaryArchSuffix
 	devel:libboost_date_time$secondaryArchSuffix >= $boostMinimumVersion
diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.recipe b/app-office/libreoffice/libreoffice-6.4.7.2.recipe
index 1f5d83512..34b4a5dd8 100644
--- a/app-office/libreoffice/libreoffice-6.4.7.2.recipe
+++ b/app-office/libreoffice/libreoffice-6.4.7.2.recipe
@@ -168,9 +168,9 @@ done
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	glm${secondaryArchSuffix}_devel
 	icu74${secondaryArchSuffix}_devel
 	unixodbc${secondaryArchSuffix}_devel
-	devel:glm
 	devel:libabw_0.1$secondaryArchSuffix
 	devel:libboost_date_time$secondaryArchSuffix >= $boostMinimumVersion
 	devel:libboost_filesystem$secondaryArchSuffix >= $boostMinimumVersion
diff --git a/app-text/libetonyek/libetonyek-0.1.12.recipe b/app-text/libetonyek/libetonyek-0.1.12.recipe
index ca0267189..ca96e9fd1 100644
--- a/app-text/libetonyek/libetonyek-0.1.12.recipe
+++ b/app-text/libetonyek/libetonyek-0.1.12.recipe
@@ -55,7 +55,7 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:glm
+	glm${secondaryArchSuffix}_devel
 	devel:libboost_system$secondaryArchSuffix
 	devel:libboost_container$secondaryArchSuffix
 	devel:libcppunit$secondaryArchSuffix
diff --git a/games-arcade/caveexpress/caveexpress-2.5.2.recipe b/games-arcade/caveexpress/caveexpress-2.5.2.recipe
index 35809c978..99d4fa9f5 100644
--- a/games-arcade/caveexpress/caveexpress-2.5.2.recipe
+++ b/games-arcade/caveexpress/caveexpress-2.5.2.recipe
@@ -36,8 +36,8 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	glm${secondaryArchSuffix}_devel
 	devel:libbox2d$secondaryArchSuffix
-	devel:glm
 #	devel:libgtest$secondaryArchSuffix
 	devel:liblua$secondaryArchSuffix >= 5.2
 	devel:libncurses$secondaryArchSuffix
diff --git a/games-arcade/cavepacker/cavepacker-2.5.2.recipe b/games-arcade/cavepacker/cavepacker-2.5.2.recipe
index 0bf8a526d..b7db28b5d 100644
--- a/games-arcade/cavepacker/cavepacker-2.5.2.recipe
+++ b/games-arcade/cavepacker/cavepacker-2.5.2.recipe
@@ -38,8 +38,8 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	glm${secondaryArchSuffix}_devel
 	devel:libBox2D$secondaryArchSuffix
-	devel:glm
 #	devel:libgtest$secondaryArchSuffix
 	devel:liblua$secondaryArchSuffix >= 5.4
 	devel:libncurses$secondaryArchSuffix
diff --git a/games-emulation/mame/mame-0.284.recipe b/games-emulation/mame/mame-0.284.recipe
index 54eefefa9..fbaeb3c69 100644
--- a/games-emulation/mame/mame-0.284.recipe
+++ b/games-emulation/mame/mame-0.284.recipe
@@ -74,7 +74,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:glm
+	glm${secondaryArchSuffix}_devel
 	devel:libexpat$secondaryArchSuffix
 	devel:libflac$secondaryArchSuffix
 	devel:libfontconfig$secondaryArchSuffix
diff --git a/games-engines/anura/anura-4.0.2.recipe b/games-engines/anura/anura-4.0.2.recipe
index 02fd73cda..932af1d7f 100644
--- a/games-engines/anura/anura-4.0.2.recipe
+++ b/games-engines/anura/anura-4.0.2.recipe
@@ -50,7 +50,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:glm
+	glm${secondaryArchSuffix}_devel
 	devel:libboost_filesystem$secondaryArchSuffix >= 1.83.0
 	devel:libboost_locale$secondaryArchSuffix >= 1.83.0
 	devel:libboost_regex$secondaryArchSuffix >= 1.83.0
diff --git a/games-engines/solarus/solarus-1.6.5.recipe b/games-engines/solarus/solarus-1.6.5.recipe
index b90cf8f36..da507e800 100644
--- a/games-engines/solarus/solarus-1.6.5.recipe
+++ b/games-engines/solarus/solarus-1.6.5.recipe
@@ -57,7 +57,7 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:glm
+	glm${secondaryArchSuffix}_devel
 	devel:libluajit_5.1$secondaryArchSuffix
 	devel:libmodplug$secondaryArchSuffix >= 1.0
 	devel:libogg$secondaryArchSuffix
diff --git a/games-rpg/arx_libertatis/arx_libertatis-1.2.recipe b/games-rpg/arx_libertatis/arx_libertatis-1.2.recipe
index fe510ac34..a7f437f32 100644
--- a/games-rpg/arx_libertatis/arx_libertatis-1.2.recipe
+++ b/games-rpg/arx_libertatis/arx_libertatis-1.2.recipe
@@ -43,7 +43,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:glm
+	glm${secondaryArchSuffix}_devel
 	devel:libboost_filesystem$secondaryArchSuffix >= 1.69.0
 	devel:libboost_system$secondaryArchSuffix >= 1.69.0
 	devel:libfreetype$secondaryArchSuffix
diff --git a/haiku-apps/stlover/stlover-1.0.1.recipe b/haiku-apps/stlover/stlover-1.0.1.recipe
index 31ca05260..7e3dafee2 100644
--- a/haiku-apps/stlover/stlover-1.0.1.recipe
+++ b/haiku-apps/stlover/stlover-1.0.1.recipe
@@ -49,7 +49,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:glm
+	glm${secondaryArchSuffix}_devel
 	devel:libadmesh$secondaryArchSuffix
 	devel:libgl$secondaryArchSuffix
 	devel:libglu$secondaryArchSuffix
diff --git a/media-gfx/asymptote/asymptote-3.04.recipe b/media-gfx/asymptote/asymptote-3.04.recipe
index 0609d3150..c5e75190a 100644
--- a/media-gfx/asymptote/asymptote-3.04.recipe
+++ b/media-gfx/asymptote/asymptote-3.04.recipe
@@ -82,8 +82,8 @@ REQUIRES_gui="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	glm${secondaryArchSuffix}_devel
 	devel:eigen$secondaryArchSuffix
-	devel:glm
 	devel:libboost_filesystem$secondaryArchSuffix >= 1.87.0
 	devel:libboost_thread$secondaryArchSuffix >= 1.87.0
 	devel:libcurl$secondaryArchSuffix
diff --git a/media-gfx/nifskope/nifskope-2.0.dev9.recipe b/media-gfx/nifskope/nifskope-2.0.dev9.recipe
index 684bcbd07..e7e791adc 100644
--- a/media-gfx/nifskope/nifskope-2.0.dev9.recipe
+++ b/media-gfx/nifskope/nifskope-2.0.dev9.recipe
@@ -46,7 +46,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:glm
+	glm${secondaryArchSuffix}_devel
 	devel:libGLU
 	devel:libqhull_r
 	devel:libz