diff --git a/ports/geckolib/gecko_style_structs.rs b/ports/geckolib/gecko_style_structs.rs
index 106ca182b15..8df2eead01e 100644
--- a/ports/geckolib/gecko_style_structs.rs
+++ b/ports/geckolib/gecko_style_structs.rs
@@ -33,6 +33,14 @@ pub mod root {
         pub mPosition: *mut CharT,
     }
     #[repr(C)]
+    #[derive(Copy, Clone)]
+    pub struct nsStringComparator;
+    #[repr(C)]
+    #[derive(Copy, Clone)]
+    pub struct nsDefaultStringComparator {
+        pub _base: nsStringComparator,
+    }
+    #[repr(C)]
     pub struct nsAString_internal {
         pub mData: *mut ::std::os::raw::c_ushort,
         pub mLength: ::std::os::raw::c_uint,
@@ -58,21 +66,11 @@ pub mod root {
     #[repr(C)]
     #[derive(Copy, Clone)]
     pub struct nsCStringComparator;
-    #[test]
-    fn bindgen_test_layout_nsCStringComparator() {
-        assert_eq!(:: std:: mem:: size_of:: < nsCStringComparator > (  ) ,
-                   8usize);
-    }
     #[repr(C)]
     #[derive(Copy, Clone)]
     pub struct nsDefaultCStringComparator {
         pub _base: nsCStringComparator,
     }
-    #[test]
-    fn bindgen_test_layout_nsDefaultCStringComparator() {
-        assert_eq!(:: std:: mem:: size_of:: < nsDefaultCStringComparator > (
-                   ) , 8usize);
-    }
     #[repr(C)]
     pub struct nsACString_internal {
         pub mData: *mut ::std::os::raw::c_char,
@@ -105,19 +103,9 @@ pub mod root {
     pub struct nsCaseInsensitiveCStringComparator {
         pub _base: nsCStringComparator,
     }
-    #[test]
-    fn bindgen_test_layout_nsCaseInsensitiveCStringComparator() {
-        assert_eq!(:: std:: mem:: size_of:: <
-                   nsCaseInsensitiveCStringComparator > (  ) , 8usize);
-    }
     #[repr(C)]
     #[derive(Copy, Clone)]
     pub struct nsCaseInsensitiveCStringArrayComparator;
-    #[test]
-    fn bindgen_test_layout_nsCaseInsensitiveCStringArrayComparator() {
-        assert_eq!(:: std:: mem:: size_of:: <
-                   nsCaseInsensitiveCStringArrayComparator > (  ) , 1usize);
-    }
     #[repr(C)]
     #[derive(Copy, Clone)]
     pub struct nsSubstringTuple {
diff --git a/ports/geckolib/tools/regen_style_structs.sh b/ports/geckolib/tools/regen_style_structs.sh
index 0add57034df..48929982c06 100755
--- a/ports/geckolib/tools/regen_style_structs.sh
+++ b/ports/geckolib/tools/regen_style_structs.sh
@@ -69,12 +69,6 @@ fi
   -match "nsSubstring"                                              \
   -match "nsTSubstring"                                             \
   -match "nsTString"                                                \
-  -blacklist-type "nsStringComparator"                              \
-  -blacklist-type "nsCStringComparator"                             \
-  -blacklist-type "nsDefaultStringComparator"                       \
-  -blacklist-type "nsDefaultCStringComparator"                      \
-  -blacklist-type "nsCaseInsensitiveCStringArrayComparator"         \
-  -blacklist-type "nsCaseInsensitiveCStringComparator"              \
   -include "$1/mozilla-config.h"                                    \
   -o ../gecko_style_structs.rs                                      \
   "$DIST_INCLUDE/nsString.h"