diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index 541868e7b2..c3477086ce 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -72,12 +72,13 @@ jobs:
           case ${{matrix.strictness}} in
             normal) ;;
             strict) case ${{matrix.compiler}} in
-                      (gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations -Wno-error=array-bounds" ;;
-                      (*)   HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
+                      (gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
+                      (*)   HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
                     esac ;;
           esac
           tee ./.bashrc <<EOENV
 
+          export HB_BUILD_TEST="${{matrix.strictness}}"
           export HB_BUILD_VERBOSE="yes"
           export HBMK_WITH_SQLITE3="local"
           export HB_USER_CFLAGS="$HB_USER_CFLAGS"
diff --git a/.github/workflows/macos-ci.yml b/.github/workflows/macos-ci.yml
index b596063955..9ab47c3806 100644
--- a/.github/workflows/macos-ci.yml
+++ b/.github/workflows/macos-ci.yml
@@ -31,14 +31,12 @@ jobs:
               (gcc) echo ${{matrix.compiler}} ;; esac) \
             slang \
             cairo \
+            freeimage \
             libgd \
             mysql \
             postgresql \
             qt5
 
-          # Dependencies for disabled contribs:
-          #  freeimage \
-
       - name: Checkout code
         uses: actions/checkout@v3
         with:
@@ -61,14 +59,13 @@ jobs:
           case ${{matrix.strictness}} in
             normal) ;;
             strict) case ${{matrix.compiler}} in
-                      (gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations -Wno-error=array-bounds" ;;
-                      (*)   HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
+                      (gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
+                      (*)   HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
                     esac ;;
           esac
           tee ./.bashrc <<EOENV
-          # These contribs do not build on any platform
-          export HB_BUILD_CONTRIBS="no hbfimage"  # incompatible with freeimage 3.18+
 
+          export HB_BUILD_TEST="${{matrix.strictness}}"
           export HB_BUILD_VERBOSE="yes"
           export HBMK_WITH_SQLITE3="local"
           export HB_USER_CFLAGS="$HB_USER_CFLAGS"
diff --git a/.github/workflows/vm2-ci.yml b/.github/workflows/vm2-ci.yml
index 738fb77fb6..043d337518 100644
--- a/.github/workflows/vm2-ci.yml
+++ b/.github/workflows/vm2-ci.yml
@@ -50,15 +50,13 @@ jobs:
               (gcc) echo ${{matrix.compiler}} ;; esac) \
             libslang2 \
             cairo \
+            freeimage \
             libgd \
             mariadb-connector-c \
             postgresql16-client \
             qt5-buildtools qt5-gui
           EOF
 
-          # Dependencies for disabled contribs:
-          #  freeimage \
-
           tee ~/work/install_omnios_deps.sh <<EOF
           #!/usr/xpg4/bin/sh
           set -ex
@@ -110,14 +108,13 @@ jobs:
           case ${{matrix.strictness}} in
             normal) ;;
             strict) case ${{matrix.compiler}} in
-                      (gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror -Wno-error=deprecated-declarations -Wno-error=array-bounds" ;;
+                      (gcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
                       (*)   HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
                     esac ;;
           esac
           tee ./.bashrc <<EOENV
-          # These contribs do not build on any platform
-          export HB_BUILD_CONTRIBS="no hbfimage"  # incompatible with freeimage 3.18+
 
+          export HB_BUILD_TEST="${{matrix.strictness}}"
           export HB_BUILD_VERBOSE="yes"
           export HBMK_WITH_SQLITE3="local"
           export HB_USER_CFLAGS="$HB_USER_CFLAGS"
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
index 005b867476..6da762317c 100644
--- a/.github/workflows/windows-ci.yml
+++ b/.github/workflows/windows-ci.yml
@@ -59,14 +59,12 @@ jobs:
             mingw-w64-${{ env.msys_cpu }}-bzip2
             mingw-w64-${{ env.msys_cpu }}-cairo
             mingw-w64-${{ env.msys_cpu }}-curl
+            mingw-w64-${{ env.msys_cpu }}-freeimage
             mingw-w64-${{ env.msys_cpu }}-libgd
             mingw-w64-${{ env.msys_cpu }}-ghostscript
             mingw-w64-${{ env.msys_cpu }}-openssl
             mingw-w64-${{ env.msys_cpu }}-qt5-base
 
-          # Dependencies for disabled contribs:
-          #  mingw-w64-${{ env.msys_cpu }}-freeimage
-
       - name: 'Add packages available on 64-bit hosts only'
         if: matrix.cpu != 'x86'
         shell: msys2 {0}
@@ -119,8 +117,6 @@ jobs:
                     esac ;;
           esac
           tee -a ./.bashrc <<EOENV
-          # These contribs do not build on any platform
-          export HB_BUILD_CONTRIBS="no hbfimage"  # incompatible with freeimage 3.18+
 
           export HB_BUILD_TEST="${{matrix.strictness}}"
           export HB_BUILD_VERBOSE="yes"
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 3d82fb8342..674b9fb4ef 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,20 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2025-01-21 09:08 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * .github/workflows/linux-ci.yml
+    * disabled global -Wno-error=... C compiler parameters
+    * set HB_BUILD_TEST="${{matrix.strictness}}" envvar
+
+  * .github/workflows/macos-ci.yml
+  * .github/workflows/vm2-ci.yml
+    * disabled global -Wno-error=... C compiler parameters
+    * set HB_BUILD_TEST="${{matrix.strictness}}" envvar
+    * reenabled hbfimage contrib library
+
+  * .github/workflows/windows-ci.yml
+    * reenabled hbfimage contrib library
+
 2025-01-21 08:46 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/3rd/sqlite3/sqlite3.hbp
     * do not enable -Wno-error=stringop-overread C compiler flag in MS-Windows
@@ -15,7 +29,7 @@
 
 2025-01-21 08:12 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * .github/workflows/linux-ci.yml
-    * reenabled hbfimage contrinb library
+    * reenabled hbfimage contrib library
 
   * src/vm/Makefile
   * src/vm/vmmt/Makefile