diff --git a/language-defs.ent b/language-defs.ent
index 05bdf9f645..2dc065058f 100644
--- a/language-defs.ent
+++ b/language-defs.ent
@@ -76,6 +76,7 @@
 <!ENTITY InheritedMethods  "Inherited methods">
 <!ENTITY InheritedProperties "Inherited properties">
 <!ENTITY Properties        "Properties">
+<!ENTITY InheritedConstants "Inherited constants">
 <!ENTITY Constants         "Constants">
 <!ENTITY NotAvailable      "Not Available">
 
diff --git a/reference/intl/intlcodepointbreakiterator.xml b/reference/intl/intlcodepointbreakiterator.xml
index 58ea433e7a..b31d203716 100644
--- a/reference/intl/intlcodepointbreakiterator.xml
+++ b/reference/intl/intlcodepointbreakiterator.xml
@@ -41,121 +41,10 @@
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
-    <classsynopsisinfo role="comment">Constants</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.done">IntlCodePointBreakIterator::DONE</varname>
-     <initializer>-1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.word-none">IntlCodePointBreakIterator::WORD_NONE</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.word-none-limit">IntlCodePointBreakIterator::WORD_NONE_LIMIT</varname>
-     <initializer>100</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.word-number">IntlCodePointBreakIterator::WORD_NUMBER</varname>
-     <initializer>100</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.word-number-limit">IntlCodePointBreakIterator::WORD_NUMBER_LIMIT</varname>
-     <initializer>200</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.word-letter">IntlCodePointBreakIterator::WORD_LETTER</varname>
-     <initializer>200</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.word-letter-limit">IntlCodePointBreakIterator::WORD_LETTER_LIMIT</varname>
-     <initializer>300</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.word-kana">IntlCodePointBreakIterator::WORD_KANA</varname>
-     <initializer>300</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.word-kana-limit">IntlCodePointBreakIterator::WORD_KANA_LIMIT</varname>
-     <initializer>400</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.word-ideo">IntlCodePointBreakIterator::WORD_IDEO</varname>
-     <initializer>400</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.word-ideo-limit">IntlCodePointBreakIterator::WORD_IDEO_LIMIT</varname>
-     <initializer>500</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.line-soft">IntlCodePointBreakIterator::LINE_SOFT</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.line-soft-limit">IntlCodePointBreakIterator::LINE_SOFT_LIMIT</varname>
-     <initializer>100</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.line-hard">IntlCodePointBreakIterator::LINE_HARD</varname>
-     <initializer>100</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.line-hard-limit">IntlCodePointBreakIterator::LINE_HARD_LIMIT</varname>
-     <initializer>200</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.sentence-term">IntlCodePointBreakIterator::SENTENCE_TERM</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.sentence-term-limit">IntlCodePointBreakIterator::SENTENCE_TERM_LIMIT</varname>
-     <initializer>100</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.sentence-sep">IntlCodePointBreakIterator::SENTENCE_SEP</varname>
-     <initializer>100</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlcodepointbreakiterator.constants.sentence-sep-limit">IntlCodePointBreakIterator::SENTENCE_SEP_LIMIT</varname>
-     <initializer>200</initializer>
-    </fieldsynopsis>
+    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.intlbreakiterator')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+     <xi:fallback />
+    </xi:include>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.intlcodepointbreakiterator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
@@ -168,149 +57,6 @@
 
   </section>
 
-<!-- {{{ IntlCodePointBreakIterator constants -->
-  <section xml:id="intlcodepointbreakiterator.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.done">
-     <term><constant>IntlCodePointBreakIterator::DONE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.word-none">
-     <term><constant>IntlCodePointBreakIterator::WORD_NONE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.word-none-limit">
-     <term><constant>IntlCodePointBreakIterator::WORD_NONE_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.word-number">
-     <term><constant>IntlCodePointBreakIterator::WORD_NUMBER</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.word-number-limit">
-     <term><constant>IntlCodePointBreakIterator::WORD_NUMBER_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.word-letter">
-     <term><constant>IntlCodePointBreakIterator::WORD_LETTER</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.word-letter-limit">
-     <term><constant>IntlCodePointBreakIterator::WORD_LETTER_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.word-kana">
-     <term><constant>IntlCodePointBreakIterator::WORD_KANA</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.word-kana-limit">
-     <term><constant>IntlCodePointBreakIterator::WORD_KANA_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.word-ideo">
-     <term><constant>IntlCodePointBreakIterator::WORD_IDEO</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.word-ideo-limit">
-     <term><constant>IntlCodePointBreakIterator::WORD_IDEO_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.line-soft">
-     <term><constant>IntlCodePointBreakIterator::LINE_SOFT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.line-soft-limit">
-     <term><constant>IntlCodePointBreakIterator::LINE_SOFT_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.line-hard">
-     <term><constant>IntlCodePointBreakIterator::LINE_HARD</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.line-hard-limit">
-     <term><constant>IntlCodePointBreakIterator::LINE_HARD_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.sentence-term">
-     <term><constant>IntlCodePointBreakIterator::SENTENCE_TERM</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.sentence-term-limit">
-     <term><constant>IntlCodePointBreakIterator::SENTENCE_TERM_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.sentence-sep">
-     <term><constant>IntlCodePointBreakIterator::SENTENCE_SEP</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlcodepointbreakiterator.constants.sentence-sep-limit">
-     <term><constant>IntlCodePointBreakIterator::SENTENCE_SEP_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
  </partintro>
 
  &reference.intl.entities.intlcodepointbreakiterator;
diff --git a/reference/intl/intlgregoriancalendar.xml b/reference/intl/intlgregoriancalendar.xml
index a1d5f7d9ad..9bc9290461 100644
--- a/reference/intl/intlgregoriancalendar.xml
+++ b/reference/intl/intlgregoriancalendar.xml
@@ -36,242 +36,11 @@
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
-    <classsynopsisinfo role="comment">Constants</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-era">IntlGregorianCalendar::FIELD_ERA</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-year">IntlGregorianCalendar::FIELD_YEAR</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-month">IntlGregorianCalendar::FIELD_MONTH</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-week-of-year">IntlGregorianCalendar::FIELD_WEEK_OF_YEAR</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-week-of-month">IntlGregorianCalendar::FIELD_WEEK_OF_MONTH</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-date">IntlGregorianCalendar::FIELD_DATE</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-day-of-year">IntlGregorianCalendar::FIELD_DAY_OF_YEAR</varname>
-     <initializer>6</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-day-of-week">IntlGregorianCalendar::FIELD_DAY_OF_WEEK</varname>
-     <initializer>7</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-day-of-week-in-month">IntlGregorianCalendar::FIELD_DAY_OF_WEEK_IN_MONTH</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-am-pm">IntlGregorianCalendar::FIELD_AM_PM</varname>
-     <initializer>9</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-hour">IntlGregorianCalendar::FIELD_HOUR</varname>
-     <initializer>10</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-hour-of-day">IntlGregorianCalendar::FIELD_HOUR_OF_DAY</varname>
-     <initializer>11</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-minute">IntlGregorianCalendar::FIELD_MINUTE</varname>
-     <initializer>12</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-second">IntlGregorianCalendar::FIELD_SECOND</varname>
-     <initializer>13</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-millisecond">IntlGregorianCalendar::FIELD_MILLISECOND</varname>
-     <initializer>14</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-zone-offset">IntlGregorianCalendar::FIELD_ZONE_OFFSET</varname>
-     <initializer>15</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-dst-offset">IntlGregorianCalendar::FIELD_DST_OFFSET</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-year-woy">IntlGregorianCalendar::FIELD_YEAR_WOY</varname>
-     <initializer>17</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-dow-local">IntlGregorianCalendar::FIELD_DOW_LOCAL</varname>
-     <initializer>18</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-extended-year">IntlGregorianCalendar::FIELD_EXTENDED_YEAR</varname>
-     <initializer>19</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-julian-day">IntlGregorianCalendar::FIELD_JULIAN_DAY</varname>
-     <initializer>20</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-milliseconds-in-day">IntlGregorianCalendar::FIELD_MILLISECONDS_IN_DAY</varname>
-     <initializer>21</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-is-leap-month">IntlGregorianCalendar::FIELD_IS_LEAP_MONTH</varname>
-     <initializer>22</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-field-count">IntlGregorianCalendar::FIELD_FIELD_COUNT</varname>
-     <initializer>23</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.field-day-of-month">IntlGregorianCalendar::FIELD_DAY_OF_MONTH</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.dow-sunday">IntlGregorianCalendar::DOW_SUNDAY</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.dow-monday">IntlGregorianCalendar::DOW_MONDAY</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.dow-tuesday">IntlGregorianCalendar::DOW_TUESDAY</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.dow-wednesday">IntlGregorianCalendar::DOW_WEDNESDAY</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.dow-thursday">IntlGregorianCalendar::DOW_THURSDAY</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.dow-friday">IntlGregorianCalendar::DOW_FRIDAY</varname>
-     <initializer>6</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.dow-saturday">IntlGregorianCalendar::DOW_SATURDAY</varname>
-     <initializer>7</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.dow-type-weekday">IntlGregorianCalendar::DOW_TYPE_WEEKDAY</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.dow-type-weekend">IntlGregorianCalendar::DOW_TYPE_WEEKEND</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.dow-type-weekend-offset">IntlGregorianCalendar::DOW_TYPE_WEEKEND_OFFSET</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.dow-type-weekend-cease">IntlGregorianCalendar::DOW_TYPE_WEEKEND_CEASE</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.walltime-first">IntlGregorianCalendar::WALLTIME_FIRST</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.walltime-last">IntlGregorianCalendar::WALLTIME_LAST</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlgregoriancalendar.constants.walltime-next-valid">IntlGregorianCalendar::WALLTIME_NEXT_VALID</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    
+    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.intlcalendar')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+     <xi:fallback />
+    </xi:include>
+
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.intlgregoriancalendar')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[1])" />
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.intlgregoriancalendar')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
@@ -284,289 +53,6 @@
 
   </section>
   
-<!-- {{{ IntlGregorianCalendar constants -->
-  <section xml:id="intlgregoriancalendar.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-era">
-     <term><constant>IntlGregorianCalendar::FIELD_ERA</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-year">
-     <term><constant>IntlGregorianCalendar::FIELD_YEAR</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-month">
-     <term><constant>IntlGregorianCalendar::FIELD_MONTH</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-week-of-year">
-     <term><constant>IntlGregorianCalendar::FIELD_WEEK_OF_YEAR</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-week-of-month">
-     <term><constant>IntlGregorianCalendar::FIELD_WEEK_OF_MONTH</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-date">
-     <term><constant>IntlGregorianCalendar::FIELD_DATE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-day-of-year">
-     <term><constant>IntlGregorianCalendar::FIELD_DAY_OF_YEAR</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-day-of-week">
-     <term><constant>IntlGregorianCalendar::FIELD_DAY_OF_WEEK</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-day-of-week-in-month">
-     <term><constant>IntlGregorianCalendar::FIELD_DAY_OF_WEEK_IN_MONTH</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-am-pm">
-     <term><constant>IntlGregorianCalendar::FIELD_AM_PM</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-hour">
-     <term><constant>IntlGregorianCalendar::FIELD_HOUR</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-hour-of-day">
-     <term><constant>IntlGregorianCalendar::FIELD_HOUR_OF_DAY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-minute">
-     <term><constant>IntlGregorianCalendar::FIELD_MINUTE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-second">
-     <term><constant>IntlGregorianCalendar::FIELD_SECOND</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-millisecond">
-     <term><constant>IntlGregorianCalendar::FIELD_MILLISECOND</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-zone-offset">
-     <term><constant>IntlGregorianCalendar::FIELD_ZONE_OFFSET</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-dst-offset">
-     <term><constant>IntlGregorianCalendar::FIELD_DST_OFFSET</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-year-woy">
-     <term><constant>IntlGregorianCalendar::FIELD_YEAR_WOY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-dow-local">
-     <term><constant>IntlGregorianCalendar::FIELD_DOW_LOCAL</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-extended-year">
-     <term><constant>IntlGregorianCalendar::FIELD_EXTENDED_YEAR</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-julian-day">
-     <term><constant>IntlGregorianCalendar::FIELD_JULIAN_DAY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-milliseconds-in-day">
-     <term><constant>IntlGregorianCalendar::FIELD_MILLISECONDS_IN_DAY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-is-leap-month">
-     <term><constant>IntlGregorianCalendar::FIELD_IS_LEAP_MONTH</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-field-count">
-     <term><constant>IntlGregorianCalendar::FIELD_FIELD_COUNT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.field-day-of-month">
-     <term><constant>IntlGregorianCalendar::FIELD_DAY_OF_MONTH</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.dow-sunday">
-     <term><constant>IntlGregorianCalendar::DOW_SUNDAY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.dow-monday">
-     <term><constant>IntlGregorianCalendar::DOW_MONDAY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.dow-tuesday">
-     <term><constant>IntlGregorianCalendar::DOW_TUESDAY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.dow-wednesday">
-     <term><constant>IntlGregorianCalendar::DOW_WEDNESDAY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.dow-thursday">
-     <term><constant>IntlGregorianCalendar::DOW_THURSDAY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.dow-friday">
-     <term><constant>IntlGregorianCalendar::DOW_FRIDAY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.dow-saturday">
-     <term><constant>IntlGregorianCalendar::DOW_SATURDAY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.dow-type-weekday">
-     <term><constant>IntlGregorianCalendar::DOW_TYPE_WEEKDAY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.dow-type-weekend">
-     <term><constant>IntlGregorianCalendar::DOW_TYPE_WEEKEND</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.dow-type-weekend-offset">
-     <term><constant>IntlGregorianCalendar::DOW_TYPE_WEEKEND_OFFSET</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.dow-type-weekend-cease">
-     <term><constant>IntlGregorianCalendar::DOW_TYPE_WEEKEND_CEASE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.walltime-first">
-     <term><constant>IntlGregorianCalendar::WALLTIME_FIRST</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.walltime-last">
-     <term><constant>IntlGregorianCalendar::WALLTIME_LAST</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlgregoriancalendar.constants.walltime-next-valid">
-     <term><constant>IntlGregorianCalendar::WALLTIME_NEXT_VALID</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
  </partintro>
 
  &reference.intl.entities.intlgregoriancalendar;
diff --git a/reference/intl/intlrulebasedbreakiterator.xml b/reference/intl/intlrulebasedbreakiterator.xml
index 2ec5ff8926..6e90ab86f6 100644
--- a/reference/intl/intlrulebasedbreakiterator.xml
+++ b/reference/intl/intlrulebasedbreakiterator.xml
@@ -47,121 +47,10 @@
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
-    <classsynopsisinfo role="comment">Constants</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.done">IntlRuleBasedBreakIterator::DONE</varname>
-     <initializer>-1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.word-none">IntlRuleBasedBreakIterator::WORD_NONE</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.word-none-limit">IntlRuleBasedBreakIterator::WORD_NONE_LIMIT</varname>
-     <initializer>100</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.word-number">IntlRuleBasedBreakIterator::WORD_NUMBER</varname>
-     <initializer>100</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.word-number-limit">IntlRuleBasedBreakIterator::WORD_NUMBER_LIMIT</varname>
-     <initializer>200</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.word-letter">IntlRuleBasedBreakIterator::WORD_LETTER</varname>
-     <initializer>200</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.word-letter-limit">IntlRuleBasedBreakIterator::WORD_LETTER_LIMIT</varname>
-     <initializer>300</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.word-kana">IntlRuleBasedBreakIterator::WORD_KANA</varname>
-     <initializer>300</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.word-kana-limit">IntlRuleBasedBreakIterator::WORD_KANA_LIMIT</varname>
-     <initializer>400</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.word-ideo">IntlRuleBasedBreakIterator::WORD_IDEO</varname>
-     <initializer>400</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.word-ideo-limit">IntlRuleBasedBreakIterator::WORD_IDEO_LIMIT</varname>
-     <initializer>500</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.line-soft">IntlRuleBasedBreakIterator::LINE_SOFT</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.line-soft-limit">IntlRuleBasedBreakIterator::LINE_SOFT_LIMIT</varname>
-     <initializer>100</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.line-hard">IntlRuleBasedBreakIterator::LINE_HARD</varname>
-     <initializer>100</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.line-hard-limit">IntlRuleBasedBreakIterator::LINE_HARD_LIMIT</varname>
-     <initializer>200</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.sentence-term">IntlRuleBasedBreakIterator::SENTENCE_TERM</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.sentence-term-limit">IntlRuleBasedBreakIterator::SENTENCE_TERM_LIMIT</varname>
-     <initializer>100</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.sentence-sep">IntlRuleBasedBreakIterator::SENTENCE_SEP</varname>
-     <initializer>100</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="intlrulebasedbreakiterator.constants.sentence-sep-limit">IntlRuleBasedBreakIterator::SENTENCE_SEP_LIMIT</varname>
-     <initializer>200</initializer>
-    </fieldsynopsis>
+    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.intlbreakiterator')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+     <xi:fallback />
+    </xi:include>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.intlrulebasedbreakiterator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
@@ -174,149 +63,6 @@
 
   </section>
 
-<!-- {{{ IntlRuleBasedBreakIterator constants -->
-  <section xml:id="intlrulebasedbreakiterator.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.done">
-     <term><constant>IntlRuleBasedBreakIterator::DONE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.word-none">
-     <term><constant>IntlRuleBasedBreakIterator::WORD_NONE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.word-none-limit">
-     <term><constant>IntlRuleBasedBreakIterator::WORD_NONE_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.word-number">
-     <term><constant>IntlRuleBasedBreakIterator::WORD_NUMBER</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.word-number-limit">
-     <term><constant>IntlRuleBasedBreakIterator::WORD_NUMBER_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.word-letter">
-     <term><constant>IntlRuleBasedBreakIterator::WORD_LETTER</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.word-letter-limit">
-     <term><constant>IntlRuleBasedBreakIterator::WORD_LETTER_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.word-kana">
-     <term><constant>IntlRuleBasedBreakIterator::WORD_KANA</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.word-kana-limit">
-     <term><constant>IntlRuleBasedBreakIterator::WORD_KANA_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.word-ideo">
-     <term><constant>IntlRuleBasedBreakIterator::WORD_IDEO</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.word-ideo-limit">
-     <term><constant>IntlRuleBasedBreakIterator::WORD_IDEO_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.line-soft">
-     <term><constant>IntlRuleBasedBreakIterator::LINE_SOFT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.line-soft-limit">
-     <term><constant>IntlRuleBasedBreakIterator::LINE_SOFT_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.line-hard">
-     <term><constant>IntlRuleBasedBreakIterator::LINE_HARD</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.line-hard-limit">
-     <term><constant>IntlRuleBasedBreakIterator::LINE_HARD_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.sentence-term">
-     <term><constant>IntlRuleBasedBreakIterator::SENTENCE_TERM</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.sentence-term-limit">
-     <term><constant>IntlRuleBasedBreakIterator::SENTENCE_TERM_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.sentence-sep">
-     <term><constant>IntlRuleBasedBreakIterator::SENTENCE_SEP</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="intlrulebasedbreakiterator.constants.sentence-sep-limit">
-     <term><constant>IntlRuleBasedBreakIterator::SENTENCE_SEP_LIMIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
  </partintro>
 
  &reference.intl.entities.intlrulebasedbreakiterator;
diff --git a/reference/phar/Phar.xml b/reference/phar/Phar.xml
index d996c4d0b4..85a941ce01 100644
--- a/reference/phar/Phar.xml
+++ b/reference/phar/Phar.xml
@@ -47,6 +47,11 @@
     </classsynopsisinfo>
 <!-- }}} -->
  
+    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.filesystemiterator')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+     <xi:fallback />
+    </xi:include>
+
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.phar')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
  
diff --git a/reference/phar/PharData.xml b/reference/phar/PharData.xml
index fea688cad9..a6ef62a959 100644
--- a/reference/phar/PharData.xml
+++ b/reference/phar/PharData.xml
@@ -41,6 +41,11 @@
     </classsynopsisinfo>
 <!-- }}} -->
  
+    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.filesystemiterator')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+     <xi:fallback />
+    </xi:include>
+
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.phardata')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
  
diff --git a/reference/reflection/reflectionobject.xml b/reference/reflection/reflectionobject.xml
index b66362fcfd..cb0f6827fe 100644
--- a/reference/reflection/reflectionobject.xml
+++ b/reference/reflection/reflectionobject.xml
@@ -41,25 +41,10 @@
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="reflectionclass.constants.is-implicit-abstract">ReflectionObject::IS_IMPLICIT_ABSTRACT</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="reflectionclass.constants.is-explicit-abstract">ReflectionObject::IS_EXPLICIT_ABSTRACT</varname>
-     <initializer>32</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>integer</type>
-     <varname linkend="reflectionclass.constants.is-final">ReflectionObject::IS_FINAL</varname>
-     <initializer>64</initializer>
-    </fieldsynopsis>
+    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.reflectionclass')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+     <xi:fallback />
+    </xi:include>
 
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
     <fieldsynopsis>
diff --git a/reference/spl/globiterator.xml b/reference/spl/globiterator.xml
index dbaaa8aa36..f44ba9e92f 100644
--- a/reference/spl/globiterator.xml
+++ b/reference/spl/globiterator.xml
@@ -45,7 +45,12 @@
      </oointerface>
     </classsynopsisinfo>
 <!-- }}} -->
-    
+
+    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.filesystemiterator')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+     <xi:fallback />
+    </xi:include>
+
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.globiterator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 
diff --git a/reference/spl/recursivearrayiterator.xml b/reference/spl/recursivearrayiterator.xml
index e7a3d69f7b..e1ef78d8b3 100644
--- a/reference/spl/recursivearrayiterator.xml
+++ b/reference/spl/recursivearrayiterator.xml
@@ -40,6 +40,12 @@
      </oointerface>
 
     </classsynopsisinfo>
+
+    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.arrayiterator')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+     <xi:fallback />
+    </xi:include>
+
     <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
     <fieldsynopsis>
      <modifier>const</modifier>
diff --git a/reference/spl/recursivecachingiterator.xml b/reference/spl/recursivecachingiterator.xml
index 8a79f3321d..3ae8aef559 100644
--- a/reference/spl/recursivecachingiterator.xml
+++ b/reference/spl/recursivecachingiterator.xml
@@ -51,7 +51,12 @@
  
     </classsynopsisinfo>
 <!-- }}} -->
- 
+
+    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.cachingiterator')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+     <xi:fallback />
+    </xi:include>
+
     <!-- {{{ If the property is documented below (xml:id=recursivecachingiterator.props) use this
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
     <fieldsynopsis>
diff --git a/reference/spl/recursivedirectoryiterator.xml b/reference/spl/recursivedirectoryiterator.xml
index 7259b18aeb..d5da75bc88 100644
--- a/reference/spl/recursivedirectoryiterator.xml
+++ b/reference/spl/recursivedirectoryiterator.xml
@@ -44,7 +44,12 @@
 
     </classsynopsisinfo>
 <!-- }}} -->
- 
+
+    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.filesystemiterator')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+     <xi:fallback />
+    </xi:include>
+
     <!-- {{{ If the property is documented below (xml:id=recursivedirectoryiterator.props) use this
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
     <fieldsynopsis>
diff --git a/reference/spl/recursiveregexiterator.xml b/reference/spl/recursiveregexiterator.xml
index c8f7ff3c61..efe97b610f 100644
--- a/reference/spl/recursiveregexiterator.xml
+++ b/reference/spl/recursiveregexiterator.xml
@@ -40,6 +40,11 @@
     </classsynopsisinfo>
 <!-- }}} -->
 
+    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.regexiterator')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+     <xi:fallback />
+    </xi:include>
+
     <!-- {{{ If the property is documented below (xml:id=recursiveregexiterator.props) use this
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
     <fieldsynopsis>
diff --git a/reference/spl/recursivetreeiterator.xml b/reference/spl/recursivetreeiterator.xml
index 711212d301..f506e48510 100644
--- a/reference/spl/recursivetreeiterator.xml
+++ b/reference/spl/recursivetreeiterator.xml
@@ -41,6 +41,11 @@
 
     </classsynopsisinfo>
 <!-- }}} -->
+    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.recursiveiteratoriterator')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+     <xi:fallback />
+    </xi:include>
+
     <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
     <fieldsynopsis>
      <modifier>const</modifier>
diff --git a/reference/spl/spltempfileobject.xml b/reference/spl/spltempfileobject.xml
index 9088c98efb..2c8d812a1b 100644
--- a/reference/spl/spltempfileobject.xml
+++ b/reference/spl/spltempfileobject.xml
@@ -45,8 +45,10 @@
     </classsynopsisinfo>
 <!-- }}} -->
 
-    <classsynopsisinfo role="comment">Inherited Constants</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.splfileobject')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis)" />
+    <classsynopsisinfo role="comment">&InheritedConstants;</classsynopsisinfo>
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.splfileobject')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Constants;']]))">
+     <xi:fallback />
+    </xi:include>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.spltempfileobject')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">