diff --git a/libvips/foreign/jpeg.h b/libvips/foreign/jpeg.h
index 3b75da17..ac7e6edc 100644
--- a/libvips/foreign/jpeg.h
+++ b/libvips/foreign/jpeg.h
@@ -42,11 +42,22 @@ extern "C" {
 #undef HAVE_STDLIB_H
 #endif /*HAVE_STDLIB_H*/
 
-/* jpeglib defines its own boolean type which then clashes with everyone
- * elses. Rename it as jboolean. 
+/* jpeglib defines its own boolean type as an enum which then clashes with 
+ * everyone elses. Rename it as jboolean. 
  */
 #define boolean jboolean
 
+/* Any TRUE/FALSE macros which have crept in will cause terrible confusion as
+ * well.
+ */
+#ifdef TRUE
+#undef TRUE
+#endif /*TRUE*/
+
+#ifdef FALSE
+#undef FALSE
+#endif /*FALSE*/
+
 #include <jpeglib.h>
 #include <jerror.h>