diff --git a/.github/workflows/checkformat.yml b/.github/workflows/checkformat.yml
index 74f72095..d94277e2 100644
--- a/.github/workflows/checkformat.yml
+++ b/.github/workflows/checkformat.yml
@@ -13,7 +13,9 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@v6
+      - name: Install clang-format
+        run: |
+          sudo apt-get install -Uyq install clang-format
       - name: Check format
         run: |
-          sudo apt --update --yes --quiet install clang-format
           contrib/checkformat.sh
diff --git a/Makefile b/Makefile
index b8235290..8f7f1ad9 100644
--- a/Makefile
+++ b/Makefile
@@ -243,12 +243,12 @@ coverage:
 
 # Target used in development to format source code with clang-format.
 format:
-	$Qclang-format -i $$(git ls-files '*.hpp' '*.cpp')
+	$Qclang-format -i $$(git ls-files '*.[hc]pp')
 
 # Target used in development to check code with clang-tidy.
 # Requires Bison-generated header files to exist.
 tidy: src/asm/parser.hpp src/link/script.hpp
-	$Qclang-tidy -p . $$(git ls-files '*.hpp' '*.cpp')
+	$Qclang-tidy -p . $$(git ls-files '*.[hc]pp')
 
 # Target used in development to remove unused `#include` headers.
 iwyu: