diff --git a/.gitattributes b/.gitattributes
index 3cf8dc6af41..ae150e86e0c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -329,11 +329,8 @@ icu4j/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hans_SG.xml -text
 icu4j/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hant.xml -text
 icu4j/src/com/ibm/icu/impl/duration/impl/data/pfd_zh_Hant_HK.xml -text
 icu4j/src/com/ibm/icu/text/BreakCTDictionary.java -text
-icu4j/src/com/ibm/icu/text/DateIntervalFormat.java -text
-icu4j/src/com/ibm/icu/text/DateIntervalInfo.java -text
 icu4j/src/com/ibm/icu/text/DurationFormat.java -text
 icu4j/src/com/ibm/icu/text/ThaiBreakIterator.java -text
-icu4j/src/com/ibm/icu/util/DateInterval.java -text
 icu4j/src/com/ibm/richtext/textapps/resources/unicode.arabic.red -text
 icu4j/src/com/ibm/richtext/textapps/resources/unicode.hebrew.red -text
 tools/unicodetools/com/ibm/rbm/docs/images/TitleLogo_transparent.gif -text
diff --git a/icu4j/preprocessor.txt b/icu4j/preprocessor.txt
index 4a0bc914d77..67609b9d98d 100644
--- a/icu4j/preprocessor.txt
+++ b/icu4j/preprocessor.txt
@@ -15,6 +15,8 @@ src/com/ibm/icu/math/BigDecimal.java
 src/com/ibm/icu/text/Bidi.java
 src/com/ibm/icu/text/ChineseDateFormat.java
 src/com/ibm/icu/text/DateFormat.java
+src/com/ibm/icu/text/DateIntervalFormat.java
+src/com/ibm/icu/text/DateIntervalInfo.java
 src/com/ibm/icu/text/DateTimePatternGenerator.java
 src/com/ibm/icu/text/DecimalFormat.java
 src/com/ibm/icu/text/DigitList.java
diff --git a/icu4j/src/com/ibm/icu/dev/test/serializable/FormatTests.java b/icu4j/src/com/ibm/icu/dev/test/serializable/FormatTests.java
index 70f6ee75dab..cfd97994ad5 100644
--- a/icu4j/src/com/ibm/icu/dev/test/serializable/FormatTests.java
+++ b/icu4j/src/com/ibm/icu/dev/test/serializable/FormatTests.java
@@ -19,8 +19,11 @@ import com.ibm.icu.text.ChineseDateFormatSymbols;
 import com.ibm.icu.text.DateFormat;
 import com.ibm.icu.text.DateFormatSymbols;
 import com.ibm.icu.util.DateInterval;
+//#if defined(FOUNDATION10) || defined(J2SE13)
+//#else
 import com.ibm.icu.text.DateIntervalFormat;
 import com.ibm.icu.text.DateIntervalInfo;
+//#endif
 import com.ibm.icu.text.DecimalFormat;
 import com.ibm.icu.text.DecimalFormatSymbols;
 import com.ibm.icu.text.DurationFormat;
@@ -1867,6 +1870,8 @@ public class FormatTests
     }
 
 
+//#if defined(FOUNDATION10) || defined(J2SE13)
+//#else
 
     public static class DateIntervalFormatHandler implements SerializableTest.Handler
     {
@@ -1889,8 +1894,8 @@ public class FormatTests
             return sfa.equals(sfb);
         }
     }
-    
-    
+
+
     public static class DateIntervalInfoHandler implements SerializableTest.Handler
     {
         public Object[] getTestObjects()
@@ -1927,6 +1932,8 @@ public class FormatTests
             return a.equals(b);
         }
     }
+//#endif
+
     public static class ChineseDateFormatHandler extends DateFormatHandler
     {
         String patterns[] = {
diff --git a/icu4j/src/com/ibm/icu/dev/test/serializable/SerializableTest.java b/icu4j/src/com/ibm/icu/dev/test/serializable/SerializableTest.java
index 35087153a98..70b1c868cdc 100644
--- a/icu4j/src/com/ibm/icu/dev/test/serializable/SerializableTest.java
+++ b/icu4j/src/com/ibm/icu/dev/test/serializable/SerializableTest.java
@@ -661,9 +661,12 @@ public class SerializableTest extends TestFmwk.TestGroup
         map.put("com.ibm.icu.text.DateFormat", new FormatTests.DateFormatHandler());
         map.put("com.ibm.icu.text.DateFormatSymbols", new FormatTests.DateFormatSymbolsHandler());
         map.put("com.ibm.icu.util.DateInterval", new DateIntervalHandler());
+//#if defined(FOUNDATION10) || defined(J2SE13)
+//#else
         map.put("com.ibm.icu.text.DateIntervalFormat", new FormatTests.DateIntervalFormatHandler());
         map.put("com.ibm.icu.text.DateIntervalInfo", new FormatTests.DateIntervalInfoHandler());
         map.put("com.ibm.icu.text.DateIntervalInfo$PatternInfo", new FormatTests.PatternInfoHandler());
+//#endif
         map.put("com.ibm.icu.text.SimpleDateFormat", new FormatTests.SimpleDateFormatHandler());
         map.put("com.ibm.icu.text.ChineseDateFormat", new FormatTests.ChineseDateFormatHandler());
         map.put("com.ibm.icu.text.ChineseDateFormatSymbols", new FormatTests.ChineseDateFormatSymbolsHandler());
diff --git a/icu4j/src/com/ibm/icu/text/DateFormat.java b/icu4j/src/com/ibm/icu/text/DateFormat.java
index d4c627dd0a3..f3954522ca5 100644
--- a/icu4j/src/com/ibm/icu/text/DateFormat.java
+++ b/icu4j/src/com/ibm/icu/text/DateFormat.java
@@ -1362,7 +1362,32 @@ public abstract class DateFormat extends UFormat {
         return getInstance(cal, ULocale.getDefault());
     }
 
+    /**
+     * Convenience overload
+     * @stable ICU 2.0
+     */
+    static final public DateFormat getDateInstance(Calendar cal, int dateStyle) {
+        return getDateInstance(cal, dateStyle, ULocale.getDefault());
+    }
 
+    /**
+     * Convenience overload
+     * @stable ICU 2.0
+     */
+    static final public DateFormat getTimeInstance(Calendar cal, int timeStyle) {
+        return getTimeInstance(cal, timeStyle, ULocale.getDefault());
+    }
+
+    /**
+     * Convenience overload
+     * @stable ICU 2.0
+     */
+    static final public DateFormat getDateTimeInstance(Calendar cal, int dateStyle, int timeStyle) {
+        return getDateTimeInstance(cal, dateStyle, timeStyle, ULocale.getDefault());
+    }
+
+//#if defined(FOUNDATION10) || defined(J2SE13)
+//#else
 
     /**
      * Create a date/time formatter from skeleton and a given locale.
@@ -1402,33 +1427,6 @@ public abstract class DateFormat extends UFormat {
         return dtfmt;
     }
 
-
-    /**
-     * Convenience overload
-     * @stable ICU 2.0
-     */
-    static final public DateFormat getDateInstance(Calendar cal, int dateStyle) {
-        return getDateInstance(cal, dateStyle, ULocale.getDefault());
-    }
-
-    /**
-     * Convenience overload
-     * @stable ICU 2.0
-     */
-    static final public DateFormat getTimeInstance(Calendar cal, int timeStyle) {
-        return getTimeInstance(cal, timeStyle, ULocale.getDefault());
-    }
-
-    /**
-     * Convenience overload
-     * @stable ICU 2.0
-     */
-    static final public DateFormat getDateTimeInstance(Calendar cal, int dateStyle, int timeStyle) {
-        return getDateTimeInstance(cal, dateStyle, timeStyle, ULocale.getDefault());
-    }
-
-//#if defined(FOUNDATION10) || defined(J2SE13)
-//#else
     /**
      * Convenience overload
      * @draft ICU 4.0
diff --git a/icu4j/src/com/ibm/icu/text/DateIntervalFormat.java b/icu4j/src/com/ibm/icu/text/DateIntervalFormat.java
index a15f55b2f96..ee720fb9f96 100644
--- a/icu4j/src/com/ibm/icu/text/DateIntervalFormat.java
+++ b/icu4j/src/com/ibm/icu/text/DateIntervalFormat.java
@@ -1,4 +1,6 @@
 //##header J2SE15
+//#if defined(FOUNDATION10) || defined(J2SE13)
+//#else
 /*
 *   Copyright (C) 2008, International Business Machines
 *   Corporation and others.  All Rights Reserved.
@@ -2175,4 +2177,4 @@ public class DateIntervalFormat extends UFormat {
         initializePattern();
     }
 }
- 
+//#endif
diff --git a/icu4j/src/com/ibm/icu/text/DateIntervalInfo.java b/icu4j/src/com/ibm/icu/text/DateIntervalInfo.java
index 970a8890320..7acbc48bbf7 100644
--- a/icu4j/src/com/ibm/icu/text/DateIntervalInfo.java
+++ b/icu4j/src/com/ibm/icu/text/DateIntervalInfo.java
@@ -1,4 +1,6 @@
 //##header J2SE15
+//#if defined(FOUNDATION10) || defined(J2SE13)
+//#else
 /*
 *   Copyright (C) 2008, International Business Machines
 *   Corporation and others.  All Rights Reserved.
@@ -915,3 +917,4 @@ public class DateIntervalInfo implements Cloneable,  Freezable, Serializable {
     //}
 
 }// end class DateIntervalInfo
+//#endif