diff --git a/rpi/setup.sh b/rpi/setup.sh
index fc56f33..021601f 100755
--- a/rpi/setup.sh
+++ b/rpi/setup.sh
@@ -355,13 +355,26 @@ else
     ln -s src/jpeglib jpeglib
 
     # Download libjpeg headers (not included in repo either)
-    echo "    Downloading libjpeg 6b headers..."
+    # Each version needs its matching headers (APIs changed between versions)
+    echo "    Downloading libjpeg headers..."
+
+    # 6b
     curl -sL "https://www.ijg.org/files/jpegsrc.v6b.tar.gz" | tar -xzf -
     cp jpeg-6b/*.h "$CJPEGLIB/6b/"
 
-    echo "    Downloading libjpeg 9f headers..."
+    # 7
+    curl -sL "https://www.ijg.org/files/jpegsrc.v7.tar.gz" | tar -xzf -
+    cp jpeg-7/*.h "$CJPEGLIB/7/"
+
+    # 8 series
+    curl -sL "https://www.ijg.org/files/jpegsrc.v8d.tar.gz" | tar -xzf -
+    for v in 8 8a 8b 8c 8d; do
+        cp jpeg-8d/*.h "$CJPEGLIB/$v/"
+    done
+
+    # 9 series
     curl -sL "https://www.ijg.org/files/jpegsrc.v9f.tar.gz" | tar -xzf -
-    for v in 7 8 8a 8b 8c 8d 9 9a 9b 9c 9d 9e 9f; do
+    for v in 9 9a 9b 9c 9d 9e 9f; do
         cp jpeg-9f/*.h "$CJPEGLIB/$v/"
     done