diff --git a/include/fmt/format.h b/include/fmt/format.h
index c6d6699a..708db3e3 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -451,11 +451,6 @@ inline Iterator& reserve(Iterator& it, std::size_t) {
   return it;
 }
 
-template <typename Char> class null_terminating_iterator;
-
-template <typename Char>
-FMT_CONSTEXPR_DECL const Char* pointer_from(null_terminating_iterator<Char> it);
-
 // An output iterator that counts the number of objects written to it and
 // discards them.
 template <typename T> class counting_iterator {
diff --git a/include/fmt/prepare.h b/include/fmt/prepare.h
index e1bf4bd1..734184f8 100644
--- a/include/fmt/prepare.h
+++ b/include/fmt/prepare.h
@@ -109,7 +109,7 @@ class format_preparation_handler : public internal::error_handler {
   typedef format_part<Char> part;
 
  public:
-  typedef internal::null_terminating_iterator<Char> iterator;
+  typedef typename basic_string_view<Char>::iterator iterator;
 
   FMT_CONSTEXPR format_preparation_handler(basic_string_view<Char> format,
                                            PartsContainer& parts)
@@ -357,9 +357,6 @@ template <typename Format> class compiletime_prepared_parts_type_provider {
   using char_type = char_t<Format>;
 
   class count_handler {
-   private:
-    typedef internal::null_terminating_iterator<char_type> iterator;
-
    public:
     FMT_CONSTEXPR count_handler() : counter_(0u) {}