diff --git a/pkgs/intl4x/lib/intl4x.dart b/pkgs/intl4x/lib/intl4x.dart
index a263df37..32dc1912 100644
--- a/pkgs/intl4x/lib/intl4x.dart
+++ b/pkgs/intl4x/lib/intl4x.dart
@@ -23,6 +23,7 @@ import 'src/plural_rules/plural_rules.dart';
 import 'src/plural_rules/plural_rules_impl.dart';
 import 'src/plural_rules/plural_rules_options.dart';
 
+export 'src/data.dart';
 export 'src/locale/locale.dart';
 export 'src/plural_rules/plural_rules.dart';
 
diff --git a/pkgs/intl4x/lib/src/datetime_format/datetime_format.dart b/pkgs/intl4x/lib/src/datetime_format/datetime_format.dart
index 2fd4dc95..05048583 100644
--- a/pkgs/intl4x/lib/src/datetime_format/datetime_format.dart
+++ b/pkgs/intl4x/lib/src/datetime_format/datetime_format.dart
@@ -19,15 +19,15 @@ import 'datetime_format_impl.dart';
 ///     .format(date); // Output: '4 mat.'
 /// ```
 class DateTimeFormat {
-  final DateTimeFormatImpl impl;
+  final DateTimeFormatImpl _impl;
 
-  DateTimeFormat(this.impl);
+  DateTimeFormat(this._impl);
 
   String format(DateTime datetime) {
     if (isInTest) {
-      return '$datetime//${impl.locale}';
+      return '$datetime//${_impl.locale}';
     } else {
-      return impl.formatImpl(datetime);
+      return _impl.formatImpl(datetime);
     }
   }
 }
diff --git a/pkgs/intl4x/lib/src/number_format/number_format.dart b/pkgs/intl4x/lib/src/number_format/number_format.dart
index 33076e0a..b54f5ae7 100644
--- a/pkgs/intl4x/lib/src/number_format/number_format.dart
+++ b/pkgs/intl4x/lib/src/number_format/number_format.dart
@@ -6,15 +6,15 @@ import '../test_checker.dart';
 import 'number_format_impl.dart';
 
 class NumberFormat {
-  final NumberFormatImpl impl;
+  final NumberFormatImpl _impl;
 
-  NumberFormat(this.impl);
+  NumberFormat(this._impl);
 
   String format(Object number) {
     if (isInTest) {
-      return '$number//${impl.locale}';
+      return '$number//${_impl.locale}';
     } else {
-      return impl.formatImpl(number);
+      return _impl.formatImpl(number);
     }
   }
 }
diff --git a/pkgs/intl4x/lib/src/plural_rules/plural_rules_4x.dart b/pkgs/intl4x/lib/src/plural_rules/plural_rules_4x.dart
index c78663b5..07cb3297 100644
--- a/pkgs/intl4x/lib/src/plural_rules/plural_rules_4x.dart
+++ b/pkgs/intl4x/lib/src/plural_rules/plural_rules_4x.dart
@@ -2,11 +2,12 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import '../../intl4x.dart';
 import '../bindings/lib.g.dart' as icu;
 import '../data.dart';
 import '../data_4x.dart';
+import '../locale/locale.dart';
 import '../locale/locale_4x.dart';
+import 'plural_rules.dart';
 import 'plural_rules_impl.dart';
 import 'plural_rules_options.dart';