--- a/layout/style/GenerateServoCSSPropList.py
+++ b/layout/style/GenerateServoCSSPropList.py
@@ -80,26 +80,21 @@ def generate_header(output, data):
             elif method.startswith("Moz"):
                 method = "CSS_PROP_DOMPROP_PREFIXED({})".format(method[3:])
             if prop.flags:
                 flags = " | ".join(prop.flags)
             else:
                 flags = "CSSPropFlags(0)"
             params = [prop.name, prop.id, method, flags, pref]
 
-        is_component_of_all = not is_internal and prop.name not in ["direction", "unicode-bidi"]
-        if not is_component_of_all:
-            output.write("#ifndef CSS_PROP_LIST_ONLY_COMPONENTS_OF_ALL_SHORTHAND\n")
         if is_internal:
             output.write("#ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL\n")
         output.write("{}({})\n".format(MACRO_NAMES[prop.type()], ", ".join(params)))
         if is_internal:
             output.write("#endif\n")
-        if not is_component_of_all:
-            output.write("#endif\n")
 
     output.write("""
 #ifdef DEFINED_CSS_PROP_ALIAS
 #undef CSS_PROP_ALIAS
 #undef DEFINED_CSS_PROP_ALIAS
 #endif
 
 #ifdef DEFINED_CSS_PROP_SHORTHAND