Put _ in front of every function in this header file

2000-12-13  Havoc Pennington  <hp@pobox.com>

* gtk/gtktextbtree.h: Put _ in front of every function in this
header file

* gtk/gtktext*.[hc]: update to reflect renamed btree functions

9 files changed, 526 insertions, 526 deletions

diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index 947a79cd18..322344e896 100644
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -72,7 +72,7 @@
 
 /*
  * The structure below is used to pass information between
- * gtk_text_btree_get_tags and inc_count:
+ * _gtk_text_btree_get_tags and inc_count:
  */
 
 typedef struct TagInfo {
@@ -346,7 +346,7 @@ chars_changed (GtkTextBTree *tree)
  */
 
 GtkTextBTree*
-gtk_text_btree_new (GtkTextTagTable *table,
+_gtk_text_btree_new (GtkTextTagTable *table,
                     GtkTextBuffer *buffer)
 {
   GtkTextBTree *tree;
@@ -431,10 +431,10 @@ gtk_text_btree_new (GtkTextTagTable *table,
     GtkTextIter start;
     GtkTextLineSegment *seg;
 
-    gtk_text_btree_get_iter_at_line_char (tree, &start, 0, 0);
+    __gtk_text_btree_get_iter_at_line_char (tree, &start, 0, 0);
 
 
-    tree->insert_mark = gtk_text_btree_set_mark (tree,
+    tree->insert_mark = _gtk_text_btree_set_mark (tree,
                                                  NULL,
                                                  "insert",
                                                  FALSE,
@@ -446,7 +446,7 @@ gtk_text_btree_new (GtkTextTagTable *table,
     seg->body.mark.not_deleteable = TRUE;
     seg->body.mark.visible = TRUE;
 
-    tree->selection_bound_mark = gtk_text_btree_set_mark (tree,
+    tree->selection_bound_mark = _gtk_text_btree_set_mark (tree,
                                                           NULL,
                                                           "selection_bound",
                                                           FALSE,
@@ -467,7 +467,7 @@ gtk_text_btree_new (GtkTextTagTable *table,
 }
 
 void
-gtk_text_btree_ref (GtkTextBTree *tree)
+_gtk_text_btree_ref (GtkTextBTree *tree)
 {
   g_return_if_fail (tree != NULL);
   g_return_if_fail (tree->refcount > 0);
@@ -486,7 +486,7 @@ mark_destroy_foreach (gpointer key, gpointer value, gpointer user_data)
 }
 
 void
-gtk_text_btree_unref (GtkTextBTree *tree)
+_gtk_text_btree_unref (GtkTextBTree *tree)
 {
   g_return_if_fail (tree != NULL);
   g_return_if_fail (tree->refcount > 0);
@@ -518,25 +518,25 @@ gtk_text_btree_unref (GtkTextBTree *tree)
 }
 
 GtkTextBuffer*
-gtk_text_btree_get_buffer (GtkTextBTree *tree)
+_gtk_text_btree_get_buffer (GtkTextBTree *tree)
 {
   return tree->buffer;
 }
 
 guint
-gtk_text_btree_get_chars_changed_stamp (GtkTextBTree *tree)
+_gtk_text_btree_get_chars_changed_stamp (GtkTextBTree *tree)
 {
   return tree->chars_changed_stamp;
 }
 
 guint
-gtk_text_btree_get_segments_changed_stamp (GtkTextBTree *tree)
+_gtk_text_btree_get_segments_changed_stamp (GtkTextBTree *tree)
 {
   return tree->segments_changed_stamp;
 }
 
 void
-gtk_text_btree_segments_changed (GtkTextBTree *tree)
+_gtk_text_btree_segments_changed (GtkTextBTree *tree)
 {
   g_return_if_fail (tree != NULL);
   segments_changed (tree);
@@ -547,7 +547,7 @@ gtk_text_btree_segments_changed (GtkTextBTree *tree)
  */
 
 void
-gtk_text_btree_delete (GtkTextIter *start,
+_gtk_text_btree_delete (GtkTextIter *start,
                        GtkTextIter *end)
 {
   GtkTextLineSegment *prev_seg;             /* The segment just before the start
@@ -591,7 +591,7 @@ gtk_text_btree_delete (GtkTextIter *start,
     line1 = gtk_text_iter_get_line (start);
     line2 = gtk_text_iter_get_line (end);
 
-    if (line2 == gtk_text_btree_line_count (tree))
+    if (line2 == _gtk_text_btree_line_count (tree))
       {
         GtkTextTag** tags;
         int array_size;
@@ -609,7 +609,7 @@ gtk_text_btree_delete (GtkTextIter *start,
             --line1;
           }
 
-        tags = gtk_text_btree_get_tags (end,
+        tags = _gtk_text_btree_get_tags (end,
                                         &array_size);
 
         if (tags != NULL)
@@ -619,7 +619,7 @@ gtk_text_btree_delete (GtkTextIter *start,
             i = 0;
             while (i < array_size)
               {
-                gtk_text_btree_tag (end, &orig_end, tags[i], FALSE);
+                _gtk_text_btree_tag (end, &orig_end, tags[i], FALSE);
 
                 ++i;
               }
@@ -630,7 +630,7 @@ gtk_text_btree_delete (GtkTextIter *start,
   }
 
   /* Broadcast the need for redisplay before we break the iterators */
-  gtk_text_btree_invalidate_region (tree, start, end);
+  _gtk_text_btree_invalidate_region (tree, start, end);
 
   /* Save the byte offset so we can reset the iterators */
   start_byte_offset = gtk_text_iter_get_line_index (start);
@@ -689,7 +689,7 @@ gtk_text_btree_delete (GtkTextIter *start,
            * (unless it's the starting line for the range).
            */
 
-          nextline = gtk_text_line_next (curline);
+          nextline = _gtk_text_line_next (curline);
           if (curline != start_line)
             {
               if (curnode == start_line->parent)
@@ -842,7 +842,7 @@ gtk_text_btree_delete (GtkTextIter *start,
           while (line)
             {
               GtkTextLine *next_line = line->next;
-              ld = gtk_text_line_get_data (line, view->view_id);
+              ld = _gtk_text_line_get_data (line, view->view_id);
 
               if (ld)
                 {
@@ -858,7 +858,7 @@ gtk_text_btree_delete (GtkTextIter *start,
 
           if (deleted_width > 0 || deleted_height > 0)
             {
-              ld = gtk_text_line_get_data (start_line, view->view_id);
+              ld = _gtk_text_line_get_data (start_line, view->view_id);
 
               /* FIXME: ld is _NOT_ necessarily non-null here, but there is currently
                * no way to add ld without also validating the node, which would
@@ -901,15 +901,15 @@ gtk_text_btree_delete (GtkTextIter *start,
   segments_changed (tree);
 
   if (gtk_debug_flags & GTK_DEBUG_TEXT)
-    gtk_text_btree_check (tree);
+    _gtk_text_btree_check (tree);
 
   /* Re-initialize our iterators */
-  gtk_text_btree_get_iter_at_line (tree, start, start_line, start_byte_offset);
+  _gtk_text_btree_get_iter_at_line (tree, start, start_line, start_byte_offset);
   *end = *start;
 }
 
 void
-gtk_text_btree_insert (GtkTextIter *iter,
+_gtk_text_btree_insert (GtkTextIter *iter,
                        const gchar *text,
                        gint len)
 {
@@ -1039,7 +1039,7 @@ gtk_text_btree_insert (GtkTextIter *iter,
     GtkTextIter end;
 
 
-    gtk_text_btree_get_iter_at_line (tree,
+    _gtk_text_btree_get_iter_at_line (tree,
                                      &start,
                                      start_line,
                                      start_byte_index);
@@ -1050,7 +1050,7 @@ gtk_text_btree_insert (GtkTextIter *iter,
        above. FIXME */
     gtk_text_iter_forward_chars (&end, char_count_delta);
 
-    gtk_text_btree_invalidate_region (tree,
+    _gtk_text_btree_invalidate_region (tree,
                                       &start, &end);
 
 
@@ -1093,16 +1093,16 @@ insert_pixbuf_or_widget_segment (GtkTextIter        *iter,
 
   /* reset *iter for the user, and invalidate tree nodes */
 
-  gtk_text_btree_get_iter_at_line (tree, &start, line, start_byte_offset);
+  _gtk_text_btree_get_iter_at_line (tree, &start, line, start_byte_offset);
 
   *iter = start;
   gtk_text_iter_forward_char (iter); /* skip forward past the segment */
 
-  gtk_text_btree_invalidate_region (tree, &start, iter);
+  _gtk_text_btree_invalidate_region (tree, &start, iter);
 }
      
 void
-gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
+__gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
                               GdkPixbuf   *pixbuf)
 {
   GtkTextLineSegment *seg;
@@ -1113,7 +1113,7 @@ gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
 }
 
 GtkTextChildAnchor*
-gtk_text_btree_create_child_anchor (GtkTextIter *iter)
+_gtk_text_btree_create_child_anchor (GtkTextIter *iter)
 {
   GtkTextLineSegment *seg;
   GtkTextBTree *tree;
@@ -1135,7 +1135,7 @@ gtk_text_btree_create_child_anchor (GtkTextIter *iter)
 }
 
 void
-gtk_text_btree_unregister_child_anchor (GtkTextChildAnchor *anchor)
+_gtk_text_btree_unregister_child_anchor (GtkTextChildAnchor *anchor)
 {
   GtkTextLineSegment *seg;
 
@@ -1157,7 +1157,7 @@ find_line_by_y (GtkTextBTree *tree, BTreeView *view,
   gint current_y = 0;
 
   if (gtk_debug_flags & GTK_DEBUG_TEXT)
-    gtk_text_btree_check (tree);
+    _gtk_text_btree_check (tree);
 
   if (node->level == 0)
     {
@@ -1169,7 +1169,7 @@ find_line_by_y (GtkTextBTree *tree, BTreeView *view,
         {
           GtkTextLineData *ld;
 
-          ld = gtk_text_line_get_data (line, view->view_id);
+          ld = _gtk_text_line_get_data (line, view->view_id);
 
           if (ld)
             {
@@ -1214,7 +1214,7 @@ find_line_by_y (GtkTextBTree *tree, BTreeView *view,
 }
 
 GtkTextLine *
-gtk_text_btree_find_line_by_y (GtkTextBTree *tree,
+_gtk_text_btree_find_line_by_y (GtkTextBTree *tree,
                                gpointer      view_id,
                                gint          ypixel,
                                gint         *line_top_out)
@@ -1252,7 +1252,7 @@ find_line_top_in_line_list (GtkTextBTree *tree,
       if (line == target_line)
         return y;
 
-      ld = gtk_text_line_get_data (line, view->view_id);
+      ld = _gtk_text_line_get_data (line, view->view_id);
       if (ld)
         y += ld->height;
 
@@ -1266,7 +1266,7 @@ find_line_top_in_line_list (GtkTextBTree *tree,
 }
 
 gint
-gtk_text_btree_find_line_top (GtkTextBTree *tree,
+_gtk_text_btree_find_line_top (GtkTextBTree *tree,
                               GtkTextLine *target_line,
                               gpointer view_id)
 {
@@ -1337,7 +1337,7 @@ gtk_text_btree_find_line_top (GtkTextBTree *tree,
 }
 
 void
-gtk_text_btree_add_view (GtkTextBTree *tree,
+_gtk_text_btree_add_view (GtkTextBTree *tree,
                          GtkTextLayout *layout)
 {
   BTreeView *view;
@@ -1369,11 +1369,11 @@ gtk_text_btree_add_view (GtkTextBTree *tree,
   line_data->height = 0;
   line_data->valid = TRUE;
 
-  gtk_text_line_add_data (last_line, line_data);
+  _gtk_text_line_add_data (last_line, line_data);
 }
 
 void
-gtk_text_btree_remove_view (GtkTextBTree *tree,
+_gtk_text_btree_remove_view (GtkTextBTree *tree,
                             gpointer view_id)
 {
   BTreeView *view;
@@ -1407,7 +1407,7 @@ gtk_text_btree_remove_view (GtkTextBTree *tree,
    * (Do this first, so that we don't try to call the view's line data destructor on it.)
    */
   last_line = get_last_line (tree);
-  line_data = gtk_text_line_remove_data (last_line, view_id);
+  line_data = _gtk_text_line_remove_data (last_line, view_id);
   g_free (line_data);
 
   gtk_text_btree_node_remove_view (view, tree->root_node, view_id);
@@ -1416,7 +1416,7 @@ gtk_text_btree_remove_view (GtkTextBTree *tree,
 }
 
 void
-gtk_text_btree_invalidate_region (GtkTextBTree *tree,
+_gtk_text_btree_invalidate_region (GtkTextBTree *tree,
                                   const GtkTextIter *start,
                                   const GtkTextIter *end)
 {
@@ -1433,7 +1433,7 @@ gtk_text_btree_invalidate_region (GtkTextBTree *tree,
 }
 
 void
-gtk_text_btree_get_view_size (GtkTextBTree *tree,
+_gtk_text_btree_get_view_size (GtkTextBTree *tree,
                               gpointer view_id,
                               gint *width,
                               gint *height)
@@ -1528,7 +1528,7 @@ queue_tag_redisplay (GtkTextBTree      *tree,
 {
   if (gtk_text_tag_affects_size (tag))
     {
-      gtk_text_btree_invalidate_region (tree, start, end);
+      _gtk_text_btree_invalidate_region (tree, start, end);
 
     }
   else if (gtk_text_tag_affects_nonsize_appearance (tag))
@@ -1541,7 +1541,7 @@ queue_tag_redisplay (GtkTextBTree      *tree,
 }
 
 void
-gtk_text_btree_tag (const GtkTextIter *start_orig,
+_gtk_text_btree_tag (const GtkTextIter *start_orig,
                     const GtkTextIter *end_orig,
                     GtkTextTag *tag,
                     gboolean add)
@@ -1788,7 +1788,7 @@ gtk_text_btree_tag (const GtkTextIter *start_orig,
   segments_changed (tree);
 
   if (gtk_debug_flags & GTK_DEBUG_TEXT)
-    gtk_text_btree_check (tree);
+    _gtk_text_btree_check (tree);
 }
 
 
@@ -1797,7 +1797,7 @@ gtk_text_btree_tag (const GtkTextIter *start_orig,
  */
 
 GtkTextLine*
-gtk_text_btree_get_line (GtkTextBTree *tree,
+_gtk_text_btree_get_line (GtkTextBTree *tree,
                          gint  line_number,
                          gint *real_line_number)
 {
@@ -1806,7 +1806,7 @@ gtk_text_btree_get_line (GtkTextBTree *tree,
   int lines_left;
   int line_count;
 
-  line_count = gtk_text_btree_line_count (tree);
+  line_count = _gtk_text_btree_line_count (tree);
 
   if (line_number < 0)
     {
@@ -1863,7 +1863,7 @@ gtk_text_btree_get_line (GtkTextBTree *tree,
 }
 
 GtkTextLine*
-gtk_text_btree_get_line_at_char (GtkTextBTree      *tree,
+__gtk_text_btree_get_line_at_char (GtkTextBTree      *tree,
                                  gint                char_index,
                                  gint               *line_start_index,
                                  gint               *real_char_index)
@@ -1947,7 +1947,7 @@ gtk_text_btree_get_line_at_char (GtkTextBTree      *tree,
 }
 
 GtkTextTag**
-gtk_text_btree_get_tags (const GtkTextIter *iter,
+_gtk_text_btree_get_tags (const GtkTextIter *iter,
                          gint *num_tags)
 {
   GtkTextBTreeNode *node;
@@ -2084,7 +2084,7 @@ copy_segment (GString *string,
       /* Don't copy if we're invisible; segments are invisible/not
          as a whole, no need to check each char */
       if (!include_hidden &&
-          gtk_text_btree_char_is_invisible (start))
+          _gtk_text_btree_char_is_invisible (start))
         {
           copy = FALSE;
           /* printf (" <invisible>\n"); */
@@ -2126,7 +2126,7 @@ copy_segment (GString *string,
           copy = FALSE;
         }
       else if (!include_hidden &&
-               gtk_text_btree_char_is_invisible (start))
+               _gtk_text_btree_char_is_invisible (start))
         {
           copy = FALSE;
         }
@@ -2142,7 +2142,7 @@ copy_segment (GString *string,
 }
 
 gchar*
-gtk_text_btree_get_text (const GtkTextIter *start_orig,
+_gtk_text_btree_get_text (const GtkTextIter *start_orig,
                          const GtkTextIter *end_orig,
                          gboolean include_hidden,
                          gboolean include_nonchars)
@@ -2191,7 +2191,7 @@ gtk_text_btree_get_text (const GtkTextIter *start_orig,
 }
 
 gint
-gtk_text_btree_line_count (GtkTextBTree *tree)
+_gtk_text_btree_line_count (GtkTextBTree *tree)
 {
   /* Subtract bogus line at the end; we return a count
      of usable lines. */
@@ -2199,7 +2199,7 @@ gtk_text_btree_line_count (GtkTextBTree *tree)
 }
 
 gint
-gtk_text_btree_char_count (GtkTextBTree *tree)
+_gtk_text_btree_char_count (GtkTextBTree *tree)
 {
   /* Exclude newline in bogus last line */
   return tree->root_node->num_chars - 1;
@@ -2207,7 +2207,7 @@ gtk_text_btree_char_count (GtkTextBTree *tree)
 
 #define LOTSA_TAGS 1000
 gboolean
-gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
+_gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
 {
   gboolean invisible = FALSE;  /* if nobody says otherwise, it's visible */
 
@@ -2382,14 +2382,14 @@ redisplay_region (GtkTextBTree      *tree,
       gint start_y, end_y;
       GtkTextLineData *ld;
 
-      start_y = gtk_text_btree_find_line_top (tree, start_line, view->view_id);
+      start_y = _gtk_text_btree_find_line_top (tree, start_line, view->view_id);
 
       if (end_line == start_line)
         end_y = start_y;
       else
-        end_y = gtk_text_btree_find_line_top (tree, end_line, view->view_id);
+        end_y = _gtk_text_btree_find_line_top (tree, end_line, view->view_id);
 
-      ld = gtk_text_line_get_data (end_line, view->view_id);
+      ld = _gtk_text_line_get_data (end_line, view->view_id);
       if (ld)
         end_y += ld->height;
 
@@ -2407,14 +2407,14 @@ redisplay_mark (GtkTextLineSegment *mark)
   GtkTextIter iter;
   GtkTextIter end;
 
-  gtk_text_btree_get_iter_at_mark (mark->body.mark.tree,
+  _gtk_text_btree_get_iter_at_mark (mark->body.mark.tree,
                                    &iter,
                                    mark->body.mark.obj);
 
   end = iter;
   gtk_text_iter_forward_char (&end);
 
-  gtk_text_btree_invalidate_region (mark->body.mark.tree,
+  _gtk_text_btree_invalidate_region (mark->body.mark.tree,
                                     &iter, &end);
 }
 
@@ -2433,7 +2433,7 @@ ensure_not_off_end (GtkTextBTree *tree,
                     GtkTextIter *iter)
 {
   if (gtk_text_iter_get_line (iter) ==
-      gtk_text_btree_line_count (tree))
+      _gtk_text_btree_line_count (tree))
     gtk_text_iter_backward_char (iter);
 }
 
@@ -2484,7 +2484,7 @@ real_set_mark (GtkTextBTree      *tree,
         {
           GtkTextIter old_pos;
 
-          gtk_text_btree_get_iter_at_mark (tree, &old_pos,
+          _gtk_text_btree_get_iter_at_mark (tree, &old_pos,
                                            mark->body.mark.obj);
           redisplay_region (tree, &old_pos, where);
         }
@@ -2545,14 +2545,14 @@ real_set_mark (GtkTextBTree      *tree,
     gtk_text_iter_check (&iter);
 
   if (gtk_debug_flags & GTK_DEBUG_TEXT)
-    gtk_text_btree_check (tree);
+    _gtk_text_btree_check (tree);
   
   return mark;
 }
 
 
 GtkTextMark*
-gtk_text_btree_set_mark (GtkTextBTree *tree,
+_gtk_text_btree_set_mark (GtkTextBTree *tree,
                          GtkTextMark  *existing_mark,
                          const gchar *name,
                          gboolean left_gravity,
@@ -2569,15 +2569,15 @@ gtk_text_btree_set_mark (GtkTextBTree *tree,
 }
 
 gboolean
-gtk_text_btree_get_selection_bounds (GtkTextBTree *tree,
+_gtk_text_btree_get_selection_bounds (GtkTextBTree *tree,
                                      GtkTextIter  *start,
                                      GtkTextIter  *end)
 {
   GtkTextIter tmp_start, tmp_end;
 
-  gtk_text_btree_get_iter_at_mark (tree, &tmp_start,
+  _gtk_text_btree_get_iter_at_mark (tree, &tmp_start,
                                    tree->insert_mark);
-  gtk_text_btree_get_iter_at_mark (tree, &tmp_end,
+  _gtk_text_btree_get_iter_at_mark (tree, &tmp_end,
                                    tree->selection_bound_mark);
 
   if (gtk_text_iter_equal (&tmp_start, &tmp_end))
@@ -2605,12 +2605,12 @@ gtk_text_btree_get_selection_bounds (GtkTextBTree *tree,
 }
 
 void
-gtk_text_btree_place_cursor (GtkTextBTree      *tree,
+_gtk_text_btree_place_cursor (GtkTextBTree      *tree,
                              const GtkTextIter *iter)
 {
   GtkTextIter start, end;
 
-  if (gtk_text_btree_get_selection_bounds (tree, &start, &end))
+  if (_gtk_text_btree_get_selection_bounds (tree, &start, &end))
     redisplay_region (tree, &start, &end);
 
   /* Move insert AND selection_bound before we redisplay */
@@ -2621,7 +2621,7 @@ gtk_text_btree_place_cursor (GtkTextBTree      *tree,
 }
 
 void
-gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree,
+__gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree,
                                     const gchar *name)
 {
   GtkTextMark *mark;
@@ -2632,11 +2632,11 @@ gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree,
   mark = g_hash_table_lookup (tree->mark_table,
                               name);
 
-  gtk_text_btree_remove_mark (tree, mark);
+  _gtk_text_btree_remove_mark (tree, mark);
 }
 
 void
-gtk_text_btree_remove_mark (GtkTextBTree *tree,
+_gtk_text_btree_remove_mark (GtkTextBTree *tree,
                             GtkTextMark *mark)
 {
   GtkTextLineSegment *segment;
@@ -2666,21 +2666,21 @@ gtk_text_btree_remove_mark (GtkTextBTree *tree,
 }
 
 gboolean
-gtk_text_btree_mark_is_insert (GtkTextBTree *tree,
+_gtk_text_btree_mark_is_insert (GtkTextBTree *tree,
                                GtkTextMark *segment)
 {
   return segment == tree->insert_mark;
 }
 
 gboolean
-gtk_text_btree_mark_is_selection_bound (GtkTextBTree *tree,
+_gtk_text_btree_mark_is_selection_bound (GtkTextBTree *tree,
                                         GtkTextMark *segment)
 {
   return segment == tree->selection_bound_mark;
 }
 
 GtkTextMark*
-gtk_text_btree_get_mark_by_name (GtkTextBTree *tree,
+_gtk_text_btree_get_mark_by_name (GtkTextBTree *tree,
                                  const gchar *name)
 {
   GtkTextLineSegment *seg;
@@ -2714,7 +2714,7 @@ gtk_text_mark_set_visible (GtkTextMark       *mark,
 }
 
 GtkTextLine*
-gtk_text_btree_first_could_contain_tag (GtkTextBTree *tree,
+_gtk_text_btree_first_could_contain_tag (GtkTextBTree *tree,
                                         GtkTextTag *tag)
 {
   GtkTextBTreeNode *node;
@@ -2766,12 +2766,12 @@ gtk_text_btree_first_could_contain_tag (GtkTextBTree *tree,
          Unfortunately this can't be done in a simple and efficient way
          right now; so I'm just going to return the
          first line in the btree. FIXME */
-      return gtk_text_btree_get_line (tree, 0, NULL);
+      return _gtk_text_btree_get_line (tree, 0, NULL);
     }
 }
 
 GtkTextLine*
-gtk_text_btree_last_could_contain_tag (GtkTextBTree *tree,
+_gtk_text_btree_last_could_contain_tag (GtkTextBTree *tree,
                                        GtkTextTag *tag)
 {
   GtkTextBTreeNode *node;
@@ -2825,7 +2825,7 @@ gtk_text_btree_last_could_contain_tag (GtkTextBTree *tree,
          at least not without complexity.
          So, we just return the last line.
       */
-      return gtk_text_btree_get_line (tree, -1, NULL);
+      return _gtk_text_btree_get_line (tree, -1, NULL);
     }
 }
 
@@ -2835,7 +2835,7 @@ gtk_text_btree_last_could_contain_tag (GtkTextBTree *tree,
  */
 
 gint
-gtk_text_line_get_number (GtkTextLine *line)
+_gtk_text_line_get_number (GtkTextLine *line)
 {
   GtkTextLine *line2;
   GtkTextBTreeNode *node, *parent, *node2;
@@ -3020,7 +3020,7 @@ find_toggle_outside_current_line (GtkTextLine *line,
 
 /* FIXME this function is far too slow, for no good reason. */
 gboolean
-gtk_text_line_char_has_tag (GtkTextLine *line,
+_gtk_text_line_char_has_tag (GtkTextLine *line,
                             GtkTextBTree *tree,
                             gint char_in_line,
                             GtkTextTag *tag)
@@ -3044,7 +3044,7 @@ gtk_text_line_char_has_tag (GtkTextLine *line,
 }
 
 gboolean
-gtk_text_line_byte_has_tag (GtkTextLine *line,
+_gtk_text_line_byte_has_tag (GtkTextLine *line,
                             GtkTextBTree *tree,
                             gint byte_in_line,
                             GtkTextTag *tag)
@@ -3068,14 +3068,14 @@ gtk_text_line_byte_has_tag (GtkTextLine *line,
 }
 
 gboolean
-gtk_text_line_is_last (GtkTextLine *line,
+_gtk_text_line_is_last (GtkTextLine *line,
                        GtkTextBTree *tree)
 {
   return line == get_last_line (tree);
 }
 
 GtkTextLine*
-gtk_text_line_next (GtkTextLine *line)
+_gtk_text_line_next (GtkTextLine *line)
 {
   GtkTextBTreeNode *node;
 
@@ -3110,7 +3110,7 @@ gtk_text_line_next (GtkTextLine *line)
 }
 
 GtkTextLine*
-gtk_text_line_previous (GtkTextLine *line)
+_gtk_text_line_previous (GtkTextLine *line)
 {
   GtkTextBTreeNode *node;
   GtkTextBTreeNode *node2;
@@ -3167,7 +3167,7 @@ gtk_text_line_previous (GtkTextLine *line)
 }
 
 void
-gtk_text_line_add_data (GtkTextLine     *line,
+_gtk_text_line_add_data (GtkTextLine     *line,
                         GtkTextLineData *data)
 {
   g_return_if_fail (line != NULL);
@@ -3186,7 +3186,7 @@ gtk_text_line_add_data (GtkTextLine     *line,
 }
 
 gpointer
-gtk_text_line_remove_data (GtkTextLine *line,
+_gtk_text_line_remove_data (GtkTextLine *line,
                            gpointer view_id)
 {
   GtkTextLineData *prev;
@@ -3219,7 +3219,7 @@ gtk_text_line_remove_data (GtkTextLine *line,
 }
 
 gpointer
-gtk_text_line_get_data (GtkTextLine *line,
+_gtk_text_line_get_data (GtkTextLine *line,
                         gpointer view_id)
 {
   GtkTextLineData *iter;
@@ -3239,7 +3239,7 @@ gtk_text_line_get_data (GtkTextLine *line,
 }
 
 void
-gtk_text_line_invalidate_wrap (GtkTextLine *line,
+_gtk_text_line_invalidate_wrap (GtkTextLine *line,
                                GtkTextLineData *ld)
 {
   /* For now this is totally unoptimized. FIXME?
@@ -3256,7 +3256,7 @@ gtk_text_line_invalidate_wrap (GtkTextLine *line,
 }
 
 gint
-gtk_text_line_char_count (GtkTextLine *line)
+_gtk_text_line_char_count (GtkTextLine *line)
 {
   GtkTextLineSegment *seg;
   gint size;
@@ -3272,7 +3272,7 @@ gtk_text_line_char_count (GtkTextLine *line)
 }
 
 gint
-gtk_text_line_byte_count (GtkTextLine *line)
+_gtk_text_line_byte_count (GtkTextLine *line)
 {
   GtkTextLineSegment *seg;
   gint size;
@@ -3289,7 +3289,7 @@ gtk_text_line_byte_count (GtkTextLine *line)
 }
 
 gint
-gtk_text_line_char_index (GtkTextLine *target_line)
+_gtk_text_line_char_index (GtkTextLine *target_line)
 {
   GSList *node_stack = NULL;
   GtkTextBTreeNode *iter;
@@ -3363,7 +3363,7 @@ gtk_text_line_char_index (GtkTextLine *target_line)
     {
       g_assert (line != NULL);
 
-      num_chars += gtk_text_line_char_count (line);
+      num_chars += _gtk_text_line_char_count (line);
 
       line = line->next;
     }
@@ -3374,7 +3374,7 @@ gtk_text_line_char_index (GtkTextLine *target_line)
 }
 
 GtkTextLineSegment*
-gtk_text_line_byte_to_segment (GtkTextLine *line,
+_gtk_text_line_byte_to_segment (GtkTextLine *line,
                                gint byte_offset,
                                gint *seg_offset)
 {
@@ -3400,7 +3400,7 @@ gtk_text_line_byte_to_segment (GtkTextLine *line,
 }
 
 GtkTextLineSegment*
-gtk_text_line_char_to_segment (GtkTextLine *line,
+_gtk_text_line_char_to_segment (GtkTextLine *line,
                                gint char_offset,
                                gint *seg_offset)
 {
@@ -3426,7 +3426,7 @@ gtk_text_line_char_to_segment (GtkTextLine *line,
 }
 
 GtkTextLineSegment*
-gtk_text_line_byte_to_any_segment (GtkTextLine *line,
+_gtk_text_line_byte_to_any_segment (GtkTextLine *line,
                                    gint byte_offset,
                                    gint *seg_offset)
 {
@@ -3452,7 +3452,7 @@ gtk_text_line_byte_to_any_segment (GtkTextLine *line,
 }
 
 GtkTextLineSegment*
-gtk_text_line_char_to_any_segment (GtkTextLine *line,
+_gtk_text_line_char_to_any_segment (GtkTextLine *line,
                                    gint char_offset,
                                    gint *seg_offset)
 {
@@ -3478,7 +3478,7 @@ gtk_text_line_char_to_any_segment (GtkTextLine *line,
 }
 
 gint
-gtk_text_line_byte_to_char (GtkTextLine *line,
+_gtk_text_line_byte_to_char (GtkTextLine *line,
                             gint byte_offset)
 {
   gint char_offset;
@@ -3522,7 +3522,7 @@ gtk_text_line_byte_to_char (GtkTextLine *line,
 }
 
 gint
-gtk_text_line_char_to_byte (GtkTextLine *line,
+_gtk_text_line_char_to_byte (GtkTextLine *line,
                             gint         char_offset)
 {
   g_warning ("FIXME not implemented");
@@ -3533,7 +3533,7 @@ gtk_text_line_char_to_byte (GtkTextLine *line,
 /* FIXME sync with char_locate (or figure out a clean
    way to merge the two functions) */
 void
-gtk_text_line_byte_locate (GtkTextLine *line,
+_gtk_text_line_byte_locate (GtkTextLine *line,
                            gint byte_offset,
                            GtkTextLineSegment **segment,
                            GtkTextLineSegment **any_segment,
@@ -3620,7 +3620,7 @@ gtk_text_line_byte_locate (GtkTextLine *line,
 /* FIXME sync with byte_locate (or figure out a clean
    way to merge the two functions) */
 void
-gtk_text_line_char_locate     (GtkTextLine     *line,
+_gtk_text_line_char_locate     (GtkTextLine     *line,
                                gint              char_offset,
                                GtkTextLineSegment **segment,
                                GtkTextLineSegment **any_segment,
@@ -3705,7 +3705,7 @@ gtk_text_line_char_locate     (GtkTextLine     *line,
 }
 
 void
-gtk_text_line_byte_to_char_offsets (GtkTextLine *line,
+__gtk_text_line_byte_to_char_offsets (GtkTextLine *line,
                                     gint byte_offset,
                                     gint *line_char_offset,
                                     gint *seg_char_offset)
@@ -3751,7 +3751,7 @@ gtk_text_line_byte_to_char_offsets (GtkTextLine *line,
 }
 
 void
-gtk_text_line_char_to_byte_offsets (GtkTextLine *line,
+__gtk_text_line_char_to_byte_offsets (GtkTextLine *line,
                                     gint char_offset,
                                     gint *line_byte_offset,
                                     gint *seg_byte_offset)
@@ -3901,7 +3901,7 @@ node_compare (GtkTextBTreeNode *lhs,
 
 /* remember that tag == NULL means "any tag" */
 GtkTextLine*
-gtk_text_line_next_could_contain_tag (GtkTextLine *line,
+__gtk_text_line_next_could_contain_tag (GtkTextLine *line,
                                       GtkTextBTree *tree,
                                       GtkTextTag  *tag)
 {
@@ -3912,14 +3912,14 @@ gtk_text_line_next_could_contain_tag (GtkTextLine *line,
   g_return_val_if_fail (line != NULL, NULL);
 
   if (gtk_debug_flags & GTK_DEBUG_TEXT)
-    gtk_text_btree_check (tree);
+    _gtk_text_btree_check (tree);
 
   if (tag == NULL)
     {
       /* Right now we can only offer linear-search if the user wants
        * to know about any tag toggle at all.
        */
-      return gtk_text_line_next (line);
+      return _gtk_text_line_next (line);
     }
 
   /* Our tag summaries only have node precision, not line
@@ -4056,7 +4056,7 @@ prev_line_under_node (GtkTextBTreeNode *node,
 }
 
 GtkTextLine*
-gtk_text_line_previous_could_contain_tag (GtkTextLine  *line,
+__gtk_text_line_previous_could_contain_tag (GtkTextLine  *line,
                                           GtkTextBTree *tree,
                                           GtkTextTag   *tag)
 {
@@ -4075,14 +4075,14 @@ gtk_text_line_previous_could_contain_tag (GtkTextLine  *line,
   g_return_val_if_fail (line != NULL, NULL);
 
   if (gtk_debug_flags & GTK_DEBUG_TEXT)
-    gtk_text_btree_check (tree);
+    _gtk_text_btree_check (tree);
 
   if (tag == NULL)
     {
       /* Right now we can only offer linear-search if the user wants
        * to know about any tag toggle at all.
        */
-      return gtk_text_line_previous (line);
+      return _gtk_text_line_previous (line);
     }
 
   /* Return same-node line, if any. */
@@ -4287,11 +4287,11 @@ get_last_line (GtkTextBTree *tree)
       GtkTextLine *line;
       gint real_line;
 
-      n_lines = gtk_text_btree_line_count (tree);
+      n_lines = _gtk_text_btree_line_count (tree);
 
       g_assert (n_lines >= 1); /* num_lines doesn't return bogus last line. */
 
-      line = gtk_text_btree_get_line (tree, n_lines, &real_line);
+      line = _gtk_text_btree_get_line (tree, n_lines, &real_line);
 
       tree->end_iter_line_stamp = tree->chars_changed_stamp;
       tree->end_iter_line = line;
@@ -4605,7 +4605,7 @@ gtk_text_btree_node_invalidate_upward (GtkTextBTreeNode *node, gpointer view_id)
 
 
 /**
- * gtk_text_btree_is_valid:
+ * _gtk_text_btree_is_valid:
  * @tree: a #GtkTextBTree
  * @view_id: ID for the view
  *
@@ -4615,7 +4615,7 @@ gtk_text_btree_node_invalidate_upward (GtkTextBTreeNode *node, gpointer view_id)
  * Return value: %TRUE if the entire #GtkTextBTree is valid
  **/
 gboolean
-gtk_text_btree_is_valid (GtkTextBTree *tree,
+_gtk_text_btree_is_valid (GtkTextBTree *tree,
                          gpointer      view_id)
 {
   NodeData *nd;
@@ -4657,7 +4657,7 @@ gtk_text_btree_node_validate (BTreeView         *view,
       /* Iterate over leading valid lines */
       while (line != NULL)
         {
-          ld = gtk_text_line_get_data (line, view_id);
+          ld = _gtk_text_line_get_data (line, view_id);
 
           if (!ld || !ld->valid)
             break;
@@ -4681,7 +4681,7 @@ gtk_text_btree_node_validate (BTreeView         *view,
       /* Iterate over invalid lines */
       while (line != NULL)
         {
-          ld = gtk_text_line_get_data (line, view_id);
+          ld = _gtk_text_line_get_data (line, view_id);
 
           if (ld && ld->valid)
             break;
@@ -4709,7 +4709,7 @@ gtk_text_btree_node_validate (BTreeView         *view,
       /* Iterate over the remaining lines */
       while (line != NULL)
         {
-          ld = gtk_text_line_get_data (line, view_id);
+          ld = _gtk_text_line_get_data (line, view_id);
           state->in_validation = FALSE;
 
           if (!ld || !ld->valid)
@@ -4801,7 +4801,7 @@ gtk_text_btree_node_validate (BTreeView         *view,
 }
 
 /**
- * gtk_text_btree_validate:
+ * _gtk_text_btree_validate:
  * @tree: a #GtkTextBTree
  * @view_id: view id
  * @max_pixels: the maximum number of pixels to validate. (No more
@@ -4817,7 +4817,7 @@ gtk_text_btree_node_validate (BTreeView         *view,
  * entire tree was already valid.
  **/
 gboolean
-gtk_text_btree_validate (GtkTextBTree *tree,
+_gtk_text_btree_validate (GtkTextBTree *tree,
                          gpointer      view_id,
                          gint          max_pixels,
                          gint         *y,
@@ -4831,7 +4831,7 @@ gtk_text_btree_validate (GtkTextBTree *tree,
   view = gtk_text_btree_get_view (tree, view_id);
   g_return_val_if_fail (view != NULL, FALSE);
 
-  if (!gtk_text_btree_is_valid (tree, view_id))
+  if (!_gtk_text_btree_is_valid (tree, view_id))
     {
       ValidateState state;
 
@@ -4853,7 +4853,7 @@ gtk_text_btree_validate (GtkTextBTree *tree,
         *new_height = state.new_height;
 
       if (gtk_debug_flags & GTK_DEBUG_TEXT)
-        gtk_text_btree_check (tree);
+        _gtk_text_btree_check (tree);
 
       return TRUE;
     }
@@ -4878,7 +4878,7 @@ gtk_text_btree_node_compute_view_aggregates (GtkTextBTreeNode *node,
 
       while (line != NULL)
         {
-          GtkTextLineData *ld = gtk_text_line_get_data (line, view_id);
+          GtkTextLineData *ld = _gtk_text_line_get_data (line, view_id);
 
           if (!ld || !ld->valid)
             valid = FALSE;
@@ -4987,7 +4987,7 @@ gtk_text_btree_node_check_valid_downward (GtkTextBTreeNode *node,
 
 
 /**
- * gtk_text_btree_validate_line:
+ * __gtk_text_btree_validate_line:
  * @tree: a #GtkTextBTree
  * @line: line to validate
  * @view_id: view ID for the view to validate
@@ -4996,7 +4996,7 @@ gtk_text_btree_node_check_valid_downward (GtkTextBTreeNode *node,
  * results up through the entire tree.
  **/
 void
-gtk_text_btree_validate_line (GtkTextBTree     *tree,
+__gtk_text_btree_validate_line (GtkTextBTree     *tree,
                               GtkTextLine      *line,
                               gpointer          view_id)
 {
@@ -5010,7 +5010,7 @@ gtk_text_btree_validate_line (GtkTextBTree     *tree,
   view = gtk_text_btree_get_view (tree, view_id);
   g_return_if_fail (view != NULL);
 
-  ld = gtk_text_line_get_data (line, view_id);
+  ld = _gtk_text_line_get_data (line, view_id);
   if (!ld || !ld->valid)
     {
       ld = gtk_text_layout_wrap (view->layout, line, ld);
@@ -5032,7 +5032,7 @@ gtk_text_btree_node_remove_view (BTreeView *view, GtkTextBTreeNode *node, gpoint
         {
           GtkTextLineData *ld;
 
-          ld = gtk_text_line_remove_data (line, view_id);
+          ld = _gtk_text_line_remove_data (line, view_id);
 
           if (ld)
             gtk_text_layout_free_line_data (view->layout, line, ld);
@@ -5225,8 +5225,8 @@ get_tree_bounds (GtkTextBTree *tree,
                  GtkTextIter *start,
                  GtkTextIter *end)
 {
-  gtk_text_btree_get_iter_at_line_char (tree, start, 0, 0);
-  gtk_text_btree_get_last_iter (tree, end);
+  __gtk_text_btree_get_iter_at_line_char (tree, start, 0, 0);
+  _gtk_text_btree_get_last_iter (tree, end);
 }
 
 static void
@@ -5244,11 +5244,11 @@ tag_changed_cb (GtkTextTagTable *table,
       GtkTextIter start;
       GtkTextIter end;
 
-      if (gtk_text_btree_get_iter_at_first_toggle (tree, &start, tag))
+      if (_gtk_text_btree_get_iter_at_first_toggle (tree, &start, tag))
         {
           /* Must be a last toggle if there was a first one. */
-          gtk_text_btree_get_iter_at_last_toggle (tree, &end, tag);
-          gtk_text_btree_invalidate_region (tree,
+          _gtk_text_btree_get_iter_at_last_toggle (tree, &end, tag);
+          _gtk_text_btree_invalidate_region (tree,
                                             &start, &end);
 
         }
@@ -5264,7 +5264,7 @@ tag_changed_cb (GtkTextTagTable *table,
         {
           gint width, height;
 
-          gtk_text_btree_get_view_size (tree, view->view_id, &width, &height);
+          _gtk_text_btree_get_view_size (tree, view->view_id, &width, &height);
           gtk_text_layout_changed (view->layout, 0, height, height);
 
           view = view->next;
@@ -5284,7 +5284,7 @@ tag_removed_cb (GtkTextTagTable *table,
 
   get_tree_bounds (tree, &start, &end);
 
-  gtk_text_btree_tag (&start, &end, tag, FALSE);
+  _gtk_text_btree_tag (&start, &end, tag, FALSE);
   gtk_text_btree_remove_tag_info (tree, tag);
 }
 
@@ -5558,7 +5558,7 @@ post_insert_fixup (GtkTextBTree *tree,
     }
 
   if (gtk_debug_flags & GTK_DEBUG_TEXT)
-    gtk_text_btree_check (tree);
+    _gtk_text_btree_check (tree);
 }
 
 static GtkTextTagInfo*
@@ -6027,7 +6027,7 @@ _gtk_change_node_toggle_count (GtkTextBTreeNode *node,
  *
  * inc_count --
  *
- *      This is a utility procedure used by gtk_text_btree_get_tags.  It
+ *      This is a utility procedure used by _gtk_text_btree_get_tags.  It
  *      increments the count for a particular tag, adding a new
  *      entry for that tag if there wasn't one previously.
  *
@@ -6114,7 +6114,7 @@ gtk_text_btree_link_segment (GtkTextLineSegment *seg,
   segments_changed (tree);
 
   if (gtk_debug_flags & GTK_DEBUG_TEXT)
-    gtk_text_btree_check (tree);
+    _gtk_text_btree_check (tree);
 }
 
 static void
@@ -6461,7 +6461,7 @@ list_of_tags (GtkTextTagTable *table)
 }
 
 void
-gtk_text_btree_check (GtkTextBTree *tree)
+_gtk_text_btree_check (GtkTextBTree *tree)
 {
   Summary *summary;
   GtkTextBTreeNode *node;
@@ -6487,19 +6487,19 @@ gtk_text_btree_check (GtkTextBTree *tree)
             {
               if (info->toggle_count != 0)
                 {
-                  g_error ("gtk_text_btree_check found \"%s\" with toggles (%d) but no root",
+                  g_error ("_gtk_text_btree_check found \"%s\" with toggles (%d) but no root",
                            tag->name, info->toggle_count);
                 }
               continue;         /* no ranges for the tag */
             }
           else if (info->toggle_count == 0)
             {
-              g_error ("gtk_text_btree_check found root for \"%s\" with no toggles",
+              g_error ("_gtk_text_btree_check found root for \"%s\" with no toggles",
                        tag->name);
             }
           else if (info->toggle_count & 1)
             {
-              g_error ("gtk_text_btree_check found odd toggle count for \"%s\" (%d)",
+              g_error ("_gtk_text_btree_check found odd toggle count for \"%s\" (%d)",
                        tag->name, info->toggle_count);
             }
           for (summary = node->summary; summary != NULL;
@@ -6507,7 +6507,7 @@ gtk_text_btree_check (GtkTextBTree *tree)
             {
               if (summary->info->tag == tag)
                 {
-                  g_error ("gtk_text_btree_check found root GtkTextBTreeNode with summary info");
+                  g_error ("_gtk_text_btree_check found root GtkTextBTreeNode with summary info");
                 }
             }
           count = 0;
@@ -6554,7 +6554,7 @@ gtk_text_btree_check (GtkTextBTree *tree)
             }
           if (count != info->toggle_count)
             {
-              g_error ("gtk_text_btree_check toggle_count (%d) wrong for \"%s\" should be (%d)",
+              g_error ("_gtk_text_btree_check toggle_count (%d) wrong for \"%s\" should be (%d)",
                        info->toggle_count, tag->name, count);
             }
         }
@@ -6577,11 +6577,11 @@ gtk_text_btree_check (GtkTextBTree *tree)
 
   if (node->num_lines < 2)
     {
-      g_error ("gtk_text_btree_check: less than 2 lines in tree");
+      g_error ("_gtk_text_btree_check: less than 2 lines in tree");
     }
   if (node->num_chars < 2)
     {
-      g_error ("gtk_text_btree_check: less than 2 chars in tree");
+      g_error ("_gtk_text_btree_check: less than 2 chars in tree");
     }
   while (node->level > 0)
     {
@@ -6611,44 +6611,44 @@ gtk_text_btree_check (GtkTextBTree *tree)
     }
   if (seg->type != &gtk_text_char_type)
     {
-      g_error ("gtk_text_btree_check: last line has bogus segment type");
+      g_error ("_gtk_text_btree_check: last line has bogus segment type");
     }
   if (seg->next != NULL)
     {
-      g_error ("gtk_text_btree_check: last line has too many segments");
+      g_error ("_gtk_text_btree_check: last line has too many segments");
     }
   if (seg->byte_count != 1)
     {
-      g_error ("gtk_text_btree_check: last line has wrong # characters: %d",
+      g_error ("_gtk_text_btree_check: last line has wrong # characters: %d",
                seg->byte_count);
     }
   if ((seg->body.chars[0] != '\n') || (seg->body.chars[1] != 0))
     {
-      g_error ("gtk_text_btree_check: last line had bad value: %s",
+      g_error ("_gtk_text_btree_check: last line had bad value: %s",
                seg->body.chars);
     }
 }
 
-void gtk_text_btree_spew_line (GtkTextBTree* tree, GtkTextLine* line);
-void gtk_text_btree_spew_segment (GtkTextBTree* tree, GtkTextLineSegment* seg);
-void gtk_text_btree_spew_node (GtkTextBTreeNode *node, int indent);
-void gtk_text_btree_spew_line_short (GtkTextLine *line, int indent);
+void _gtk_text_btree_spew_line (GtkTextBTree* tree, GtkTextLine* line);
+void _gtk_text_btree_spew_segment (GtkTextBTree* tree, GtkTextLineSegment* seg);
+void _gtk_text_btree_spew_node (GtkTextBTreeNode *node, int indent);
+void _gtk_text_btree_spew_line_short (GtkTextLine *line, int indent);
 
 void
-gtk_text_btree_spew (GtkTextBTree *tree)
+_gtk_text_btree_spew (GtkTextBTree *tree)
 {
   GtkTextLine * line;
   int real_line;
 
   printf ("%d lines in tree %p\n",
-          gtk_text_btree_line_count (tree), tree);
+          _gtk_text_btree_line_count (tree), tree);
 
-  line = gtk_text_btree_get_line (tree, 0, &real_line);
+  line = _gtk_text_btree_get_line (tree, 0, &real_line);
 
   while (line != NULL)
     {
-      gtk_text_btree_spew_line (tree, line);
-      line = gtk_text_line_next (line);
+      _gtk_text_btree_spew_line (tree, line);
+      line = _gtk_text_line_next (line);
     }
 
   printf ("=================== Tag information\n");
@@ -6679,12 +6679,12 @@ gtk_text_btree_spew (GtkTextBTree *tree)
   printf ("=================== Tree nodes\n");
 
   {
-    gtk_text_btree_spew_node (tree->root_node, 0);
+    _gtk_text_btree_spew_node (tree->root_node, 0);
   }
 }
 
 void
-gtk_text_btree_spew_line_short (GtkTextLine *line, int indent)
+_gtk_text_btree_spew_line_short (GtkTextLine *line, int indent)
 {
   gchar * spaces;
   GtkTextLineSegment *seg;
@@ -6693,8 +6693,8 @@ gtk_text_btree_spew_line_short (GtkTextLine *line, int indent)
 
   printf ("%sline %p chars %d bytes %d\n",
           spaces, line,
-          gtk_text_line_char_count (line),
-          gtk_text_line_byte_count (line));
+          _gtk_text_line_char_count (line),
+          _gtk_text_line_byte_count (line));
 
   seg = line->segments;
   while (seg != NULL)
@@ -6742,7 +6742,7 @@ gtk_text_btree_spew_line_short (GtkTextLine *line, int indent)
 }
 
 void
-gtk_text_btree_spew_node (GtkTextBTreeNode *node, int indent)
+_gtk_text_btree_spew_node (GtkTextBTreeNode *node, int indent)
 {
   gchar * spaces;
   GtkTextBTreeNode *iter;
@@ -6769,7 +6769,7 @@ gtk_text_btree_spew_node (GtkTextBTreeNode *node, int indent)
       iter = node->children.node;
       while (iter != NULL)
         {
-          gtk_text_btree_spew_node (iter, indent + 2);
+          _gtk_text_btree_spew_node (iter, indent + 2);
 
           iter = iter->next;
         }
@@ -6779,7 +6779,7 @@ gtk_text_btree_spew_node (GtkTextBTreeNode *node, int indent)
       GtkTextLine *line = node->children.line;
       while (line != NULL)
         {
-          gtk_text_btree_spew_line_short (line, indent + 2);
+          _gtk_text_btree_spew_line_short (line, indent + 2);
 
           line = line->next;
         }
@@ -6787,24 +6787,24 @@ gtk_text_btree_spew_node (GtkTextBTreeNode *node, int indent)
 }
 
 void
-gtk_text_btree_spew_line (GtkTextBTree* tree, GtkTextLine* line)
+_gtk_text_btree_spew_line (GtkTextBTree* tree, GtkTextLine* line)
 {
   GtkTextLineSegment * seg;
 
   printf ("%4d| line: %p parent: %p next: %p\n",
-          gtk_text_line_get_number (line), line, line->parent, line->next);
+          _gtk_text_line_get_number (line), line, line->parent, line->next);
 
   seg = line->segments;
 
   while (seg != NULL)
     {
-      gtk_text_btree_spew_segment (tree, seg);
+      _gtk_text_btree_spew_segment (tree, seg);
       seg = seg->next;
     }
 }
 
 void
-gtk_text_btree_spew_segment (GtkTextBTree* tree, GtkTextLineSegment * seg)
+_gtk_text_btree_spew_segment (GtkTextBTree* tree, GtkTextLineSegment * seg)
 {
   printf ("     segment: %p type: %s bytes: %d chars: %d\n",
           seg, seg->type->name, seg->byte_count, seg->char_count);
diff --git a/gtk/gtktextbtree.h b/gtk/gtktextbtree.h
index a2229373ce..3763ed5a21 100644
--- a/gtk/gtktextbtree.h
+++ b/gtk/gtktextbtree.h
@@ -12,157 +12,157 @@
 extern "C" {
 #endif /* __cplusplus */
 
-GtkTextBTree  *gtk_text_btree_new        (GtkTextTagTable *table,
-                                          GtkTextBuffer   *buffer);
-void           gtk_text_btree_ref        (GtkTextBTree    *tree);
-void           gtk_text_btree_unref      (GtkTextBTree    *tree);
-GtkTextBuffer *gtk_text_btree_get_buffer (GtkTextBTree    *tree);
+GtkTextBTree  *_gtk_text_btree_new        (GtkTextTagTable *table,
+                                           GtkTextBuffer   *buffer);
+void           _gtk_text_btree_ref        (GtkTextBTree    *tree);
+void           _gtk_text_btree_unref      (GtkTextBTree    *tree);
+GtkTextBuffer *_gtk_text_btree_get_buffer (GtkTextBTree    *tree);
 
 
-guint gtk_text_btree_get_chars_changed_stamp    (GtkTextBTree *tree);
-guint gtk_text_btree_get_segments_changed_stamp (GtkTextBTree *tree);
-void  gtk_text_btree_segments_changed           (GtkTextBTree *tree);
+guint _gtk_text_btree_get_chars_changed_stamp    (GtkTextBTree *tree);
+guint _gtk_text_btree_get_segments_changed_stamp (GtkTextBTree *tree);
+void  _gtk_text_btree_segments_changed           (GtkTextBTree *tree);
 
 
 /* Indexable segment mutation */
 
-void gtk_text_btree_delete        (GtkTextIter *start,
-                                   GtkTextIter *end);
-void gtk_text_btree_insert        (GtkTextIter *iter,
-                                   const gchar *text,
-                                   gint         len);
-void gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
-                                   GdkPixbuf   *pixbuf);
+void _gtk_text_btree_delete        (GtkTextIter *start,
+                                    GtkTextIter *end);
+void _gtk_text_btree_insert        (GtkTextIter *iter,
+                                    const gchar *text,
+                                    gint         len);
+void __gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
+                                     GdkPixbuf   *pixbuf);
 
-GtkTextChildAnchor* gtk_text_btree_create_child_anchor (GtkTextIter *iter);
+GtkTextChildAnchor* _gtk_text_btree_create_child_anchor (GtkTextIter *iter);
 
-void gtk_text_btree_unregister_child_anchor (GtkTextChildAnchor *anchor);
+void _gtk_text_btree_unregister_child_anchor (GtkTextChildAnchor *anchor);
 
 /* View stuff */
-GtkTextLine *gtk_text_btree_find_line_by_y    (GtkTextBTree      *tree,
-                                               gpointer           view_id,
-                                               gint               ypixel,
-                                               gint              *line_top_y);
-gint         gtk_text_btree_find_line_top     (GtkTextBTree      *tree,
-                                               GtkTextLine       *line,
-                                               gpointer           view_id);
-void         gtk_text_btree_add_view          (GtkTextBTree      *tree,
-                                               GtkTextLayout     *layout);
-void         gtk_text_btree_remove_view       (GtkTextBTree      *tree,
-                                               gpointer           view_id);
-void         gtk_text_btree_invalidate_region (GtkTextBTree      *tree,
-                                               const GtkTextIter *start,
-                                               const GtkTextIter *end);
-void         gtk_text_btree_get_view_size     (GtkTextBTree      *tree,
-                                               gpointer           view_id,
-                                               gint              *width,
-                                               gint              *height);
-gboolean     gtk_text_btree_is_valid          (GtkTextBTree      *tree,
-                                               gpointer           view_id);
-gboolean     gtk_text_btree_validate          (GtkTextBTree      *tree,
-                                               gpointer           view_id,
-                                               gint               max_pixels,
-                                               gint              *y,
-                                               gint              *old_height,
-                                               gint              *new_height);
-void         gtk_text_btree_validate_line     (GtkTextBTree      *tree,
-                                               GtkTextLine       *line,
-                                               gpointer           view_id);
+GtkTextLine *_gtk_text_btree_find_line_by_y    (GtkTextBTree      *tree,
+                                                gpointer           view_id,
+                                                gint               ypixel,
+                                                gint              *line_top_y);
+gint         _gtk_text_btree_find_line_top     (GtkTextBTree      *tree,
+                                                GtkTextLine       *line,
+                                                gpointer           view_id);
+void         _gtk_text_btree_add_view          (GtkTextBTree      *tree,
+                                                GtkTextLayout     *layout);
+void         _gtk_text_btree_remove_view       (GtkTextBTree      *tree,
+                                                gpointer           view_id);
+void         _gtk_text_btree_invalidate_region (GtkTextBTree      *tree,
+                                                const GtkTextIter *start,
+                                                const GtkTextIter *end);
+void         _gtk_text_btree_get_view_size     (GtkTextBTree      *tree,
+                                                gpointer           view_id,
+                                                gint              *width,
+                                                gint              *height);
+gboolean     _gtk_text_btree_is_valid          (GtkTextBTree      *tree,
+                                                gpointer           view_id);
+gboolean     _gtk_text_btree_validate          (GtkTextBTree      *tree,
+                                                gpointer           view_id,
+                                                gint               max_pixels,
+                                                gint              *y,
+                                                gint              *old_height,
+                                                gint              *new_height);
+void         __gtk_text_btree_validate_line     (GtkTextBTree      *tree,
+                                                 GtkTextLine       *line,
+                                                 gpointer           view_id);
 
 /* Tag */
 
-void gtk_text_btree_tag (const GtkTextIter *start,
-                         const GtkTextIter *end,
-                         GtkTextTag        *tag,
-                         gboolean           apply);
+void _gtk_text_btree_tag (const GtkTextIter *start,
+                          const GtkTextIter *end,
+                          GtkTextTag        *tag,
+                          gboolean           apply);
 
 /* "Getters" */
 
-GtkTextLine * gtk_text_btree_get_line          (GtkTextBTree      *tree,
-                                                gint               line_number,
-                                                gint              *real_line_number);
-GtkTextLine * gtk_text_btree_get_line_at_char  (GtkTextBTree      *tree,
-                                                gint               char_index,
-                                                gint              *line_start_index,
-                                                gint              *real_char_index);
-GtkTextTag**  gtk_text_btree_get_tags          (const GtkTextIter *iter,
-                                                gint              *num_tags);
-gchar        *gtk_text_btree_get_text          (const GtkTextIter *start,
-                                                const GtkTextIter *end,
-                                                gboolean           include_hidden,
-                                                gboolean           include_nonchars);
-gint          gtk_text_btree_line_count        (GtkTextBTree      *tree);
-gint          gtk_text_btree_char_count        (GtkTextBTree      *tree);
-gboolean      gtk_text_btree_char_is_invisible (const GtkTextIter *iter);
+GtkTextLine * _gtk_text_btree_get_line          (GtkTextBTree      *tree,
+                                                 gint               line_number,
+                                                 gint              *real_line_number);
+GtkTextLine * __gtk_text_btree_get_line_at_char  (GtkTextBTree      *tree,
+                                                  gint               char_index,
+                                                  gint              *line_start_index,
+                                                  gint              *real_char_index);
+GtkTextTag**  _gtk_text_btree_get_tags          (const GtkTextIter *iter,
+                                                 gint              *num_tags);
+gchar        *_gtk_text_btree_get_text          (const GtkTextIter *start,
+                                                 const GtkTextIter *end,
+                                                 gboolean           include_hidden,
+                                                 gboolean           include_nonchars);
+gint          _gtk_text_btree_line_count        (GtkTextBTree      *tree);
+gint          _gtk_text_btree_char_count        (GtkTextBTree      *tree);
+gboolean      _gtk_text_btree_char_is_invisible (const GtkTextIter *iter);
 
 
 
 /* Get iterators (these are implemented in gtktextiter.c) */
-void     gtk_text_btree_get_iter_at_char         (GtkTextBTree       *tree,
-                                                  GtkTextIter        *iter,
-                                                  gint                char_index);
-void     gtk_text_btree_get_iter_at_line_char    (GtkTextBTree       *tree,
-                                                  GtkTextIter        *iter,
-                                                  gint                line_number,
-                                                  gint                char_index);
-void     gtk_text_btree_get_iter_at_line_byte    (GtkTextBTree       *tree,
-                                                  GtkTextIter        *iter,
-                                                  gint                line_number,
-                                                  gint                byte_index);
-gboolean gtk_text_btree_get_iter_from_string     (GtkTextBTree       *tree,
-                                                  GtkTextIter        *iter,
-                                                  const gchar        *string);
-gboolean gtk_text_btree_get_iter_at_mark_name    (GtkTextBTree       *tree,
-                                                  GtkTextIter        *iter,
-                                                  const gchar        *mark_name);
-void     gtk_text_btree_get_iter_at_mark         (GtkTextBTree       *tree,
-                                                  GtkTextIter        *iter,
-                                                  GtkTextMark        *mark);
-void     gtk_text_btree_get_last_iter            (GtkTextBTree       *tree,
-                                                  GtkTextIter        *iter);
-void     gtk_text_btree_get_iter_at_line         (GtkTextBTree       *tree,
-                                                  GtkTextIter        *iter,
-                                                  GtkTextLine        *line,
-                                                  gint                byte_offset);
-gboolean gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree       *tree,
-                                                  GtkTextIter        *iter,
-                                                  GtkTextTag         *tag);
-gboolean gtk_text_btree_get_iter_at_last_toggle  (GtkTextBTree       *tree,
-                                                  GtkTextIter        *iter,
-                                                  GtkTextTag         *tag);
-
-void     gtk_text_btree_get_iter_at_child_anchor  (GtkTextBTree       *tree,
+void     _gtk_text_btree_get_iter_at_char         (GtkTextBTree       *tree,
                                                    GtkTextIter        *iter,
-                                                   GtkTextChildAnchor *anchor);
+                                                   gint                char_index);
+void     __gtk_text_btree_get_iter_at_line_char    (GtkTextBTree       *tree,
+                                                    GtkTextIter        *iter,
+                                                    gint                line_number,
+                                                    gint                char_index);
+void     __gtk_text_btree_get_iter_at_line_byte    (GtkTextBTree       *tree,
+                                                    GtkTextIter        *iter,
+                                                    gint                line_number,
+                                                    gint                byte_index);
+gboolean _gtk_text_btree_get_iter_from_string     (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter,
+                                                   const gchar        *string);
+gboolean __gtk_text_btree_get_iter_at_mark_name    (GtkTextBTree       *tree,
+                                                    GtkTextIter        *iter,
+                                                    const gchar        *mark_name);
+void     _gtk_text_btree_get_iter_at_mark         (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter,
+                                                   GtkTextMark        *mark);
+void     _gtk_text_btree_get_last_iter            (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter);
+void     _gtk_text_btree_get_iter_at_line         (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter,
+                                                   GtkTextLine        *line,
+                                                   gint                byte_offset);
+gboolean _gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter,
+                                                   GtkTextTag         *tag);
+gboolean _gtk_text_btree_get_iter_at_last_toggle  (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter,
+                                                   GtkTextTag         *tag);
+
+void     _gtk_text_btree_get_iter_at_child_anchor  (GtkTextBTree       *tree,
+                                                    GtkTextIter        *iter,
+                                                    GtkTextChildAnchor *anchor);
 
 
 
 /* Manipulate marks */
-GtkTextMark        *gtk_text_btree_set_mark                (GtkTextBTree       *tree,
-                                                            GtkTextMark         *existing_mark,
-                                                            const gchar        *name,
-                                                            gboolean            left_gravity,
-                                                            const GtkTextIter  *index,
-                                                            gboolean           should_exist);
-void                gtk_text_btree_remove_mark_by_name     (GtkTextBTree       *tree,
-                                                            const gchar        *name);
-void                gtk_text_btree_remove_mark             (GtkTextBTree       *tree,
-                                                            GtkTextMark        *segment);
-gboolean            gtk_text_btree_get_selection_bounds    (GtkTextBTree       *tree,
-                                                            GtkTextIter        *start,
-                                                            GtkTextIter        *end);
-void                gtk_text_btree_place_cursor            (GtkTextBTree       *tree,
-                                                            const GtkTextIter  *where);
-gboolean            gtk_text_btree_mark_is_insert          (GtkTextBTree       *tree,
-                                                            GtkTextMark        *segment);
-gboolean            gtk_text_btree_mark_is_selection_bound (GtkTextBTree       *tree,
-                                                            GtkTextMark        *segment);
-GtkTextMark        *gtk_text_btree_get_mark_by_name        (GtkTextBTree       *tree,
-                                                            const gchar        *name);
-GtkTextLine *       gtk_text_btree_first_could_contain_tag (GtkTextBTree       *tree,
-                                                            GtkTextTag         *tag);
-GtkTextLine *       gtk_text_btree_last_could_contain_tag  (GtkTextBTree       *tree,
-                                                            GtkTextTag         *tag);
+GtkTextMark        *_gtk_text_btree_set_mark                (GtkTextBTree       *tree,
+                                                             GtkTextMark         *existing_mark,
+                                                             const gchar        *name,
+                                                             gboolean            left_gravity,
+                                                             const GtkTextIter  *index,
+                                                             gboolean           should_exist);
+void                __gtk_text_btree_remove_mark_by_name     (GtkTextBTree       *tree,
+                                                              const gchar        *name);
+void                _gtk_text_btree_remove_mark             (GtkTextBTree       *tree,
+                                                             GtkTextMark        *segment);
+gboolean            _gtk_text_btree_get_selection_bounds    (GtkTextBTree       *tree,
+                                                             GtkTextIter        *start,
+                                                             GtkTextIter        *end);
+void                _gtk_text_btree_place_cursor            (GtkTextBTree       *tree,
+                                                             const GtkTextIter  *where);
+gboolean            _gtk_text_btree_mark_is_insert          (GtkTextBTree       *tree,
+                                                             GtkTextMark        *segment);
+gboolean            _gtk_text_btree_mark_is_selection_bound (GtkTextBTree       *tree,
+                                                             GtkTextMark        *segment);
+GtkTextMark        *_gtk_text_btree_get_mark_by_name        (GtkTextBTree       *tree,
+                                                             const gchar        *name);
+GtkTextLine *       _gtk_text_btree_first_could_contain_tag (GtkTextBTree       *tree,
+                                                             GtkTextTag         *tag);
+GtkTextLine *       _gtk_text_btree_last_could_contain_tag  (GtkTextBTree       *tree,
+                                                             GtkTextTag         *tag);
 
 /* Lines */
 
@@ -195,78 +195,78 @@ struct _GtkTextLine {
 };
 
 
-gint                gtk_text_line_get_number                 (GtkTextLine         *line);
-gboolean            gtk_text_line_char_has_tag               (GtkTextLine         *line,
-                                                              GtkTextBTree        *tree,
-                                                              gint                 char_in_line,
-                                                              GtkTextTag          *tag);
-gboolean            gtk_text_line_byte_has_tag               (GtkTextLine         *line,
-                                                              GtkTextBTree        *tree,
-                                                              gint                 byte_in_line,
-                                                              GtkTextTag          *tag);
-gboolean            gtk_text_line_is_last                    (GtkTextLine  *line,
-                                                              GtkTextBTree *tree);
-GtkTextLine *       gtk_text_line_next                       (GtkTextLine         *line);
-GtkTextLine *       gtk_text_line_previous                   (GtkTextLine         *line);
-void                gtk_text_line_add_data                   (GtkTextLine         *line,
-                                                              GtkTextLineData     *data);
-gpointer            gtk_text_line_remove_data                (GtkTextLine         *line,
-                                                              gpointer             view_id);
-gpointer            gtk_text_line_get_data                   (GtkTextLine         *line,
-                                                              gpointer             view_id);
-void                gtk_text_line_invalidate_wrap            (GtkTextLine         *line,
-                                                              GtkTextLineData     *ld);
-gint                gtk_text_line_char_count                 (GtkTextLine         *line);
-gint                gtk_text_line_byte_count                 (GtkTextLine         *line);
-gint                gtk_text_line_char_index                 (GtkTextLine         *line);
-GtkTextLineSegment *gtk_text_line_byte_to_segment            (GtkTextLine         *line,
-                                                              gint                 byte_offset,
-                                                              gint                *seg_offset);
-GtkTextLineSegment *gtk_text_line_char_to_segment            (GtkTextLine         *line,
-                                                              gint                 char_offset,
-                                                              gint                *seg_offset);
-void                gtk_text_line_byte_locate                (GtkTextLine         *line,
-                                                              gint                 byte_offset,
-                                                              GtkTextLineSegment **segment,
-                                                              GtkTextLineSegment **any_segment,
-                                                              gint                *seg_byte_offset,
-                                                              gint                *line_byte_offset);
-void                gtk_text_line_char_locate                (GtkTextLine         *line,
-                                                              gint                 char_offset,
-                                                              GtkTextLineSegment **segment,
-                                                              GtkTextLineSegment **any_segment,
-                                                              gint                *seg_char_offset,
-                                                              gint                *line_char_offset);
-void                gtk_text_line_byte_to_char_offsets       (GtkTextLine         *line,
-                                                              gint                 byte_offset,
-                                                              gint                *line_char_offset,
-                                                              gint                *seg_char_offset);
-void                gtk_text_line_char_to_byte_offsets       (GtkTextLine         *line,
-                                                              gint                 char_offset,
-                                                              gint                *line_byte_offset,
-                                                              gint                *seg_byte_offset);
-GtkTextLineSegment *gtk_text_line_byte_to_any_segment        (GtkTextLine         *line,
-                                                              gint                 byte_offset,
-                                                              gint                *seg_offset);
-GtkTextLineSegment *gtk_text_line_char_to_any_segment        (GtkTextLine         *line,
-                                                              gint                 char_offset,
-                                                              gint                *seg_offset);
-gint                gtk_text_line_byte_to_char               (GtkTextLine         *line,
-                                                              gint                 byte_offset);
-gint                gtk_text_line_char_to_byte               (GtkTextLine         *line,
-                                                              gint                 char_offset);
-GtkTextLine    *    gtk_text_line_next_could_contain_tag     (GtkTextLine         *line,
-                                                              GtkTextBTree        *tree,
-                                                              GtkTextTag          *tag);
-GtkTextLine    *    gtk_text_line_previous_could_contain_tag (GtkTextLine         *line,
-                                                              GtkTextBTree        *tree,
-                                                              GtkTextTag          *tag);
+gint                _gtk_text_line_get_number                 (GtkTextLine         *line);
+gboolean            _gtk_text_line_char_has_tag               (GtkTextLine         *line,
+                                                               GtkTextBTree        *tree,
+                                                               gint                 char_in_line,
+                                                               GtkTextTag          *tag);
+gboolean            _gtk_text_line_byte_has_tag               (GtkTextLine         *line,
+                                                               GtkTextBTree        *tree,
+                                                               gint                 byte_in_line,
+                                                               GtkTextTag          *tag);
+gboolean            _gtk_text_line_is_last                    (GtkTextLine  *line,
+                                                               GtkTextBTree *tree);
+GtkTextLine *       _gtk_text_line_next                       (GtkTextLine         *line);
+GtkTextLine *       _gtk_text_line_previous                   (GtkTextLine         *line);
+void                _gtk_text_line_add_data                   (GtkTextLine         *line,
+                                                               GtkTextLineData     *data);
+gpointer            _gtk_text_line_remove_data                (GtkTextLine         *line,
+                                                               gpointer             view_id);
+gpointer            _gtk_text_line_get_data                   (GtkTextLine         *line,
+                                                               gpointer             view_id);
+void                _gtk_text_line_invalidate_wrap            (GtkTextLine         *line,
+                                                               GtkTextLineData     *ld);
+gint                _gtk_text_line_char_count                 (GtkTextLine         *line);
+gint                _gtk_text_line_byte_count                 (GtkTextLine         *line);
+gint                _gtk_text_line_char_index                 (GtkTextLine         *line);
+GtkTextLineSegment *_gtk_text_line_byte_to_segment            (GtkTextLine         *line,
+                                                               gint                 byte_offset,
+                                                               gint                *seg_offset);
+GtkTextLineSegment *_gtk_text_line_char_to_segment            (GtkTextLine         *line,
+                                                               gint                 char_offset,
+                                                               gint                *seg_offset);
+void                _gtk_text_line_byte_locate                (GtkTextLine         *line,
+                                                               gint                 byte_offset,
+                                                               GtkTextLineSegment **segment,
+                                                               GtkTextLineSegment **any_segment,
+                                                               gint                *seg_byte_offset,
+                                                               gint                *line_byte_offset);
+void                _gtk_text_line_char_locate                (GtkTextLine         *line,
+                                                               gint                 char_offset,
+                                                               GtkTextLineSegment **segment,
+                                                               GtkTextLineSegment **any_segment,
+                                                               gint                *seg_char_offset,
+                                                               gint                *line_char_offset);
+void                __gtk_text_line_byte_to_char_offsets       (GtkTextLine         *line,
+                                                                gint                 byte_offset,
+                                                                gint                *line_char_offset,
+                                                                gint                *seg_char_offset);
+void                __gtk_text_line_char_to_byte_offsets       (GtkTextLine         *line,
+                                                                gint                 char_offset,
+                                                                gint                *line_byte_offset,
+                                                                gint                *seg_byte_offset);
+GtkTextLineSegment *_gtk_text_line_byte_to_any_segment        (GtkTextLine         *line,
+                                                               gint                 byte_offset,
+                                                               gint                *seg_offset);
+GtkTextLineSegment *_gtk_text_line_char_to_any_segment        (GtkTextLine         *line,
+                                                               gint                 char_offset,
+                                                               gint                *seg_offset);
+gint                _gtk_text_line_byte_to_char               (GtkTextLine         *line,
+                                                               gint                 byte_offset);
+gint                _gtk_text_line_char_to_byte               (GtkTextLine         *line,
+                                                               gint                 char_offset);
+GtkTextLine    *    __gtk_text_line_next_could_contain_tag     (GtkTextLine         *line,
+                                                                GtkTextBTree        *tree,
+                                                                GtkTextTag          *tag);
+GtkTextLine    *    __gtk_text_line_previous_could_contain_tag (GtkTextLine         *line,
+                                                                GtkTextBTree        *tree,
+                                                                GtkTextTag          *tag);
 
 
 /* Debug */
-void gtk_text_btree_check (GtkTextBTree *tree);
-void gtk_text_btree_spew (GtkTextBTree *tree);
-extern gboolean gtk_text_view_debug_btree;
+void _gtk_text_btree_check (GtkTextBTree *tree);
+void _gtk_text_btree_spew (GtkTextBTree *tree);
+extern gboolean _gtk_text_view_debug_btree;
 
 /* ignore, exported only for gtktextsegment.c */
 void _gtk_toggle_segment_check_func (GtkTextLineSegment *segPtr,
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index d3f7f2cca9..0010615a7e 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -288,7 +288,7 @@ gtk_text_buffer_finalize (GObject *object)
 
   if (buffer->btree)
     {
-      gtk_text_btree_unref (buffer->btree);
+      _gtk_text_btree_unref (buffer->btree);
       buffer->btree = NULL;
     }
 
@@ -318,7 +318,7 @@ static GtkTextBTree*
 get_btree (GtkTextBuffer *buffer)
 {
   if (buffer->btree == NULL)
-    buffer->btree = gtk_text_btree_new (gtk_text_buffer_get_tag_table (buffer),
+    buffer->btree = _gtk_text_btree_new (gtk_text_buffer_get_tag_table (buffer),
                                         buffer);
 
   return buffer->btree;
@@ -403,7 +403,7 @@ gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer,
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
   g_return_if_fail (iter != NULL);
 
-  gtk_text_btree_insert (iter, text, len);
+  _gtk_text_btree_insert (iter, text, len);
 
   gtk_signal_emit (GTK_OBJECT (buffer), signals[CHANGED]);
 }
@@ -1046,7 +1046,7 @@ gtk_text_buffer_real_delete_text (GtkTextBuffer *buffer,
   g_return_if_fail (start != NULL);
   g_return_if_fail (end != NULL);
 
-  gtk_text_btree_delete (start, end);
+  _gtk_text_btree_delete (start, end);
 
   /* may have deleted the selection... */
   gtk_text_buffer_update_primary_selection (buffer);
@@ -1330,7 +1330,7 @@ gtk_text_buffer_insert_pixbuf         (GtkTextBuffer      *buffer,
   g_return_if_fail (iter != NULL);
   g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
 
-  gtk_text_btree_insert_pixbuf (iter, pixbuf);
+  __gtk_text_btree_insert_pixbuf (iter, pixbuf);
 
   /* FIXME pixbuf-specific signal like insert_text */
 
@@ -1350,7 +1350,7 @@ gtk_text_buffer_create_child_anchor (GtkTextBuffer *buffer,
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
   g_return_val_if_fail (iter != NULL, NULL);
 
-  anchor = gtk_text_btree_create_child_anchor (iter);
+  anchor = _gtk_text_btree_create_child_anchor (iter);
 
   /* FIXME child-anchor-specific signal */
   
@@ -1414,20 +1414,20 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer,
   GtkTextIter location;
   GtkTextMark *mark;
 
-  mark = gtk_text_btree_set_mark (get_btree (buffer),
+  mark = _gtk_text_btree_set_mark (get_btree (buffer),
                                   existing_mark,
                                   mark_name,
                                   left_gravity,
                                   iter,
                                   should_exist);
 
-  if (gtk_text_btree_mark_is_insert (get_btree (buffer), mark) ||
-      gtk_text_btree_mark_is_selection_bound (get_btree (buffer), mark))
+  if (_gtk_text_btree_mark_is_insert (get_btree (buffer), mark) ||
+      _gtk_text_btree_mark_is_selection_bound (get_btree (buffer), mark))
     {
       gtk_text_buffer_update_primary_selection (buffer);
     }
 
-  gtk_text_btree_get_iter_at_mark (get_btree (buffer),
+  _gtk_text_btree_get_iter_at_mark (get_btree (buffer),
                                    &location,
                                    mark);
 
@@ -1513,7 +1513,7 @@ gtk_text_buffer_get_iter_at_mark (GtkTextBuffer *buffer,
   g_return_if_fail (!gtk_text_mark_get_deleted (mark));
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
 
-  gtk_text_btree_get_iter_at_mark (get_btree (buffer),
+  _gtk_text_btree_get_iter_at_mark (get_btree (buffer),
                                    iter,
                                    mark);
 }
@@ -1543,7 +1543,7 @@ gtk_text_buffer_delete_mark (GtkTextBuffer *buffer,
 
   g_object_ref (G_OBJECT (mark));
 
-  gtk_text_btree_remove_mark (get_btree (buffer), mark);
+  _gtk_text_btree_remove_mark (get_btree (buffer), mark);
 
   /* See rationale above for MARK_SET on why we emit this after
    * removing the mark, rather than removing the mark in a default
@@ -1574,7 +1574,7 @@ gtk_text_buffer_get_mark (GtkTextBuffer      *buffer,
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
   g_return_val_if_fail (name != NULL, NULL);
 
-  mark = gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
+  mark = _gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
 
   return mark;
 }
@@ -1599,7 +1599,7 @@ gtk_text_buffer_move_mark_by_name (GtkTextBuffer     *buffer,
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
   g_return_if_fail (name != NULL);
 
-  mark = gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
+  mark = _gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
 
   if (mark == NULL)
     {
@@ -1627,7 +1627,7 @@ gtk_text_buffer_delete_mark_by_name (GtkTextBuffer     *buffer,
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
   g_return_if_fail (name != NULL);
 
-  mark = gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
+  mark = _gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
 
   if (mark == NULL)
     {
@@ -1695,7 +1695,7 @@ gtk_text_buffer_get_iter_at_child_anchor (GtkTextBuffer      *buffer,
   g_return_if_fail (GTK_IS_TEXT_CHILD_ANCHOR (anchor));
   g_return_if_fail (!gtk_text_child_anchor_get_deleted (anchor));
   
-  gtk_text_btree_get_iter_at_child_anchor (get_btree (buffer),
+  _gtk_text_btree_get_iter_at_child_anchor (get_btree (buffer),
                                            iter,
                                            anchor);
 }
@@ -1726,7 +1726,7 @@ gtk_text_buffer_place_cursor (GtkTextBuffer     *buffer,
   if (gtk_text_iter_is_last (&real))
     gtk_text_iter_backward_char (&real);
 
-  gtk_text_btree_place_cursor (get_btree (buffer), &real);
+  _gtk_text_btree_place_cursor (get_btree (buffer), &real);
   gtk_text_buffer_mark_set (buffer, &real,
                             gtk_text_buffer_get_mark (buffer,
                                                       "insert"));
@@ -1774,7 +1774,7 @@ gtk_text_buffer_real_apply_tag (GtkTextBuffer *buffer,
                                 const GtkTextIter *start,
                                 const GtkTextIter *end)
 {
-  gtk_text_btree_tag (start, end, tag, TRUE);
+  _gtk_text_btree_tag (start, end, tag, TRUE);
 }
 
 static void
@@ -1783,7 +1783,7 @@ gtk_text_buffer_real_remove_tag (GtkTextBuffer *buffer,
                                  const GtkTextIter *start,
                                  const GtkTextIter *end)
 {
-  gtk_text_btree_tag (start, end, tag, FALSE);
+  _gtk_text_btree_tag (start, end, tag, FALSE);
 }
 
 static void
@@ -1909,7 +1909,7 @@ gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer      *buffer,
   g_return_if_fail (iter != NULL);
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
 
-  gtk_text_btree_get_iter_at_line_char (get_btree (buffer),
+  __gtk_text_btree_get_iter_at_line_char (get_btree (buffer),
                                         iter, line_number, char_offset);
 }
 
@@ -1922,7 +1922,7 @@ gtk_text_buffer_get_iter_at_line_index  (GtkTextBuffer *buffer,
   g_return_if_fail (iter != NULL);
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
 
-  gtk_text_btree_get_iter_at_line_byte (get_btree (buffer),
+  __gtk_text_btree_get_iter_at_line_byte (get_btree (buffer),
                                         iter, line_number, byte_index);
 }
 
@@ -1945,7 +1945,7 @@ gtk_text_buffer_get_iter_at_offset         (GtkTextBuffer      *buffer,
   g_return_if_fail (iter != NULL);
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
 
-  gtk_text_btree_get_iter_at_char (get_btree (buffer), iter, char_offset);
+  _gtk_text_btree_get_iter_at_char (get_btree (buffer), iter, char_offset);
 }
 
 void
@@ -1955,7 +1955,7 @@ gtk_text_buffer_get_last_iter         (GtkTextBuffer      *buffer,
   g_return_if_fail (iter != NULL);
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
 
-  gtk_text_btree_get_last_iter (get_btree (buffer), iter);
+  _gtk_text_btree_get_last_iter (get_btree (buffer), iter);
 }
 
 void
@@ -1967,8 +1967,8 @@ gtk_text_buffer_get_bounds (GtkTextBuffer *buffer,
   g_return_if_fail (end != NULL);
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
 
-  gtk_text_btree_get_iter_at_char (get_btree (buffer), start, 0);
-  gtk_text_btree_get_last_iter (get_btree (buffer), end);
+  _gtk_text_btree_get_iter_at_char (get_btree (buffer), start, 0);
+  _gtk_text_btree_get_last_iter (get_btree (buffer), end);
 }
 
 /*
@@ -2012,7 +2012,7 @@ gtk_text_buffer_get_line_count (GtkTextBuffer *buffer)
 {
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), 0);
 
-  return gtk_text_btree_line_count (get_btree (buffer));
+  return _gtk_text_btree_line_count (get_btree (buffer));
 }
 
 gint
@@ -2020,7 +2020,7 @@ gtk_text_buffer_get_char_count (GtkTextBuffer *buffer)
 {
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), 0);
 
-  return gtk_text_btree_char_count (get_btree (buffer));
+  return _gtk_text_btree_char_count (get_btree (buffer));
 }
 
 /* Called when we lose the primary selection.
@@ -2613,7 +2613,7 @@ gtk_text_buffer_get_selection_bounds   (GtkTextBuffer      *buffer,
 {
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
 
-  return gtk_text_btree_get_selection_bounds (get_btree (buffer), start, end);
+  return _gtk_text_btree_get_selection_bounds (get_btree (buffer), start, end);
 }
 
 /*
@@ -2725,10 +2725,10 @@ _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer     *buffer,
     {
       buffer->log_attr_cache = g_new0 (GtkTextLogAttrCache, 1);
       buffer->log_attr_cache->chars_changed_stamp =
-        gtk_text_btree_get_chars_changed_stamp (get_btree (buffer));
+        _gtk_text_btree_get_chars_changed_stamp (get_btree (buffer));
     }
   else if (buffer->log_attr_cache->chars_changed_stamp !=
-           gtk_text_btree_get_chars_changed_stamp (get_btree (buffer)))
+           _gtk_text_btree_get_chars_changed_stamp (get_btree (buffer)))
     {
       clear_log_attr_cache (buffer->log_attr_cache);
     }
@@ -2773,7 +2773,7 @@ _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer     *buffer,
 void
 _gtk_text_buffer_spew (GtkTextBuffer *buffer)
 {
-  gtk_text_btree_spew (get_btree (buffer));
+  _gtk_text_btree_spew (get_btree (buffer));
 }
 
 
diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c
index 5595e2d4ce..c6075bb60d 100644
--- a/gtk/gtktextchild.c
+++ b/gtk/gtktextchild.c
@@ -142,7 +142,7 @@ child_segment_delete_func (GtkTextLineSegment *seg,
   GSList *tmp_list;
   GSList *copy;
 
-  gtk_text_btree_unregister_child_anchor (seg->body.child.obj);
+  _gtk_text_btree_unregister_child_anchor (seg->body.child.obj);
   
   seg->body.child.tree = NULL;
   seg->body.child.line = NULL;
diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c
index b02ade89f4..60e8714fb8 100644
--- a/gtk/gtktextdisplay.c
+++ b/gtk/gtktextdisplay.c
@@ -741,12 +741,12 @@ gtk_text_layout_draw (GtkTextLayout *layout,
       if (have_selection)
         {
           GtkTextIter line_start, line_end;
-          gint byte_count = gtk_text_line_byte_count (line);
+          gint byte_count = _gtk_text_line_byte_count (line);
 
-          gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+          _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
                                            &line_start,
                                            line, 0);
-          gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+          _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
                                            &line_end,
                                            line, byte_count - 1);
 
diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index 4d2ea8522e..acf977137a 100644
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -73,7 +73,7 @@ iter_set_common (GtkTextRealIter *iter,
 {
   /* Update segments stamp */
   iter->segments_changed_stamp =
-    gtk_text_btree_get_segments_changed_stamp (iter->tree);
+    _gtk_text_btree_get_segments_changed_stamp (iter->tree);
 
   iter->line = line;
 
@@ -92,7 +92,7 @@ iter_set_from_byte_offset (GtkTextRealIter *iter,
 {
   iter_set_common (iter, line);
 
-  gtk_text_line_byte_locate (iter->line,
+  _gtk_text_line_byte_locate (iter->line,
                              byte_offset,
                              &iter->segment,
                              &iter->any_segment,
@@ -108,7 +108,7 @@ iter_set_from_char_offset (GtkTextRealIter *iter,
 {
   iter_set_common (iter, line);
 
-  gtk_text_line_char_locate (iter->line,
+  _gtk_text_line_char_locate (iter->line,
                              char_offset,
                              &iter->segment,
                              &iter->any_segment,
@@ -147,7 +147,7 @@ gtk_text_iter_make_surreal (const GtkTextIter *_iter)
   GtkTextRealIter *iter = (GtkTextRealIter*)_iter;
 
   if (iter->chars_changed_stamp !=
-      gtk_text_btree_get_chars_changed_stamp (iter->tree))
+      _gtk_text_btree_get_chars_changed_stamp (iter->tree))
     {
       g_warning ("Invalid text buffer iterator: either the iterator "
                  "is uninitialized, or the characters/pixbufs/widgets "
@@ -168,7 +168,7 @@ gtk_text_iter_make_surreal (const GtkTextIter *_iter)
      should have used make_real. */
 
   if (iter->segments_changed_stamp !=
-      gtk_text_btree_get_segments_changed_stamp (iter->tree))
+      _gtk_text_btree_get_segments_changed_stamp (iter->tree))
     {
       iter->segment = NULL;
       iter->any_segment = NULL;
@@ -188,7 +188,7 @@ gtk_text_iter_make_real (const GtkTextIter *_iter)
   iter = gtk_text_iter_make_surreal (_iter);
 
   if (iter->segments_changed_stamp !=
-      gtk_text_btree_get_segments_changed_stamp (iter->tree))
+      _gtk_text_btree_get_segments_changed_stamp (iter->tree))
     {
       if (iter->line_byte_offset >= 0)
         {
@@ -225,7 +225,7 @@ iter_init_common (GtkTextIter *_iter,
   iter->tree = tree;
 
   iter->chars_changed_stamp =
-    gtk_text_btree_get_chars_changed_stamp (iter->tree);
+    _gtk_text_btree_get_chars_changed_stamp (iter->tree);
 
   return iter;
 }
@@ -342,7 +342,7 @@ ensure_char_offsets (GtkTextRealIter *iter)
     {
       g_assert (iter->line_byte_offset >= 0);
 
-      gtk_text_line_byte_to_char_offsets (iter->line,
+      __gtk_text_line_byte_to_char_offsets (iter->line,
                                           iter->line_byte_offset,
                                           &iter->line_char_offset,
                                           &iter->segment_char_offset);
@@ -356,7 +356,7 @@ ensure_byte_offsets (GtkTextRealIter *iter)
     {
       g_assert (iter->line_char_offset >= 0);
 
-      gtk_text_line_char_to_byte_offsets (iter->line,
+      __gtk_text_line_char_to_byte_offsets (iter->line,
                                           iter->line_char_offset,
                                           &iter->line_byte_offset,
                                           &iter->segment_byte_offset);
@@ -402,7 +402,7 @@ gtk_text_iter_get_buffer (const GtkTextIter *iter)
 
   check_invariants (iter);
 
-  return gtk_text_btree_get_buffer (real->tree);
+  return _gtk_text_btree_get_buffer (real->tree);
 }
 
 /**
@@ -587,7 +587,7 @@ gtk_text_iter_get_offset (const GtkTextIter *iter)
       ensure_char_offsets (real);
       
       real->cached_char_index =
-        gtk_text_line_char_index (real->line);
+        _gtk_text_line_char_index (real->line);
       real->cached_char_index += real->line_char_offset;
     }
 
@@ -620,7 +620,7 @@ gtk_text_iter_get_line (const GtkTextIter *iter)
 
   if (real->cached_line_number < 0)
     real->cached_line_number =
-      gtk_text_line_get_number (real->line);
+      _gtk_text_line_get_number (real->line);
 
   check_invariants (iter);
 
@@ -762,7 +762,7 @@ gtk_text_iter_get_slice       (const GtkTextIter *start,
   check_invariants (start);
   check_invariants (end);
 
-  return gtk_text_btree_get_text (start, end, TRUE, TRUE);
+  return _gtk_text_btree_get_text (start, end, TRUE, TRUE);
 }
 
 /**
@@ -788,7 +788,7 @@ gtk_text_iter_get_text       (const GtkTextIter *start,
   check_invariants (start);
   check_invariants (end);
 
-  return gtk_text_btree_get_text (start, end, TRUE, FALSE);
+  return _gtk_text_btree_get_text (start, end, TRUE, FALSE);
 }
 
 /**
@@ -812,7 +812,7 @@ gtk_text_iter_get_visible_slice (const GtkTextIter  *start,
   check_invariants (start);
   check_invariants (end);
 
-  return gtk_text_btree_get_text (start, end, FALSE, TRUE);
+  return _gtk_text_btree_get_text (start, end, FALSE, TRUE);
 }
 
 /**
@@ -836,7 +836,7 @@ gtk_text_iter_get_visible_text (const GtkTextIter  *start,
   check_invariants (start);
   check_invariants (end);
 
-  return gtk_text_btree_get_text (start, end, FALSE, FALSE);
+  return _gtk_text_btree_get_text (start, end, FALSE, FALSE);
 }
 
 /**
@@ -1163,13 +1163,13 @@ gtk_text_iter_has_tag           (const GtkTextIter   *iter,
 
   if (real->line_byte_offset >= 0)
     {
-      return gtk_text_line_byte_has_tag (real->line, real->tree,
+      return _gtk_text_line_byte_has_tag (real->line, real->tree,
                                          real->line_byte_offset, tag);
     }
   else
     {
       g_assert (real->line_char_offset >= 0);
-      return gtk_text_line_char_has_tag (real->line, real->tree,
+      return _gtk_text_line_char_has_tag (real->line, real->tree,
                                          real->line_char_offset, tag);
     }
 }
@@ -1196,7 +1196,7 @@ gtk_text_iter_get_tags (const GtkTextIter *iter)
   g_return_val_if_fail (iter != NULL, NULL);
   
   /* Get the tags at this spot */
-  tags = gtk_text_btree_get_tags (iter, &tag_count);
+  tags = _gtk_text_btree_get_tags (iter, &tag_count);
 
   /* No tags, use default style */
   if (tags == NULL || tag_count == 0)
@@ -1396,7 +1396,7 @@ gtk_text_iter_is_last (const GtkTextIter *iter)
 
   check_invariants (iter);
 
-  return gtk_text_line_is_last (real->line, real->tree);
+  return _gtk_text_line_is_last (real->line, real->tree);
 }
 
 /**
@@ -1485,7 +1485,7 @@ gtk_text_iter_get_attributes (const GtkTextIter  *iter,
   gint tag_count = 0;
 
   /* Get the tags at this spot */
-  tags = gtk_text_btree_get_tags (iter, &tag_count);
+  tags = _gtk_text_btree_get_tags (iter, &tag_count);
 
   /* No tags, use default style */
   if (tags == NULL || tag_count == 0)
@@ -1521,7 +1521,7 @@ forward_line_leaving_caches_unmodified (GtkTextRealIter *real)
 {
   GtkTextLine *new_line;
 
-  new_line = gtk_text_line_next (real->line);
+  new_line = _gtk_text_line_next (real->line);
 
   g_assert (new_line != real->line);
 
@@ -1556,7 +1556,7 @@ forward_line_leaving_caches_unmodified (GtkTextRealIter *real)
          line at the end is a single char segment containing
          a newline. */
       if (real->segments_changed_stamp ==
-          gtk_text_btree_get_segments_changed_stamp (real->tree))
+          _gtk_text_btree_get_segments_changed_stamp (real->tree))
         {
           g_assert (real->segment->type == &gtk_text_char_type);
           g_assert (real->segment->char_count == 1);
@@ -1577,7 +1577,7 @@ backward_line_leaving_caches_unmodified (GtkTextRealIter *real)
 {
   GtkTextLine *new_line;
 
-  new_line = gtk_text_line_previous (real->line);
+  new_line = _gtk_text_line_previous (real->line);
 
   g_assert (new_line != real->line);
 
@@ -2042,7 +2042,7 @@ gtk_text_iter_forward_chars (GtkTextIter *iter, gint count)
 
       current_char_index = gtk_text_iter_get_offset (iter);
 
-      if (current_char_index == gtk_text_btree_char_count (real->tree))
+      if (current_char_index == _gtk_text_btree_char_count (real->tree))
         return FALSE; /* can't move forward */
 
       new_char_index = current_char_index + count;
@@ -2288,7 +2288,7 @@ gtk_text_iter_backward_line (GtkTextIter *iter)
 
   check_invariants (iter);
 
-  new_line = gtk_text_line_previous (real->line);
+  new_line = _gtk_text_line_previous (real->line);
 
   offset_will_change = FALSE;
   if (real->line_char_offset > 0)
@@ -2316,7 +2316,7 @@ gtk_text_iter_backward_line (GtkTextIter *iter)
 
   /* Find first segment in line */
   real->any_segment = real->line->segments;
-  real->segment = gtk_text_line_byte_to_segment (real->line,
+  real->segment = _gtk_text_line_byte_to_segment (real->line,
                                                  0, &offset);
 
   g_assert (offset == 0);
@@ -2670,7 +2670,7 @@ gtk_text_iter_set_line (GtkTextIter *iter,
 
   check_invariants (iter);
 
-  line = gtk_text_btree_get_line (real->tree, line_number, &real_line);
+  line = _gtk_text_btree_get_line (real->tree, line_number, &real_line);
 
   iter_set_from_char_offset (real, line, 0);
 
@@ -2701,7 +2701,7 @@ gtk_text_iter_set_offset (GtkTextIter *iter, gint char_index)
       real->cached_char_index == char_index)
     return;
 
-  line = gtk_text_btree_get_line_at_char (real->tree,
+  line = __gtk_text_btree_get_line_at_char (real->tree,
                                           char_index,
                                           &line_start,
                                           &real_char_index);
@@ -2727,7 +2727,7 @@ gtk_text_iter_forward_to_end  (GtkTextIter       *iter)
   if (real == NULL)
     return;
 
-  buffer = gtk_text_btree_get_buffer (real->tree);
+  buffer = _gtk_text_btree_get_buffer (real->tree);
 
   gtk_text_buffer_get_last_iter (buffer, iter);
 }
@@ -2799,7 +2799,7 @@ gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter,
   check_invariants (iter);
 
   current_line = real->line;
-  next_line = gtk_text_line_next_could_contain_tag (current_line,
+  next_line = __gtk_text_line_next_could_contain_tag (current_line,
                                                     real->tree, tag);
 
   while (gtk_text_iter_forward_indexable_segment (iter))
@@ -2813,7 +2813,7 @@ gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter,
           if (next_line == NULL)
             {
               /* End of search. Set to end of buffer. */
-              gtk_text_btree_get_last_iter (real->tree, iter);
+              _gtk_text_btree_get_last_iter (real->tree, iter);
               return FALSE;
             }
 
@@ -2821,7 +2821,7 @@ gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter,
             iter_set_from_byte_offset (real, next_line, 0);
 
           current_line = real->line;
-          next_line = gtk_text_line_next_could_contain_tag (current_line,
+          next_line = __gtk_text_line_next_could_contain_tag (current_line,
                                                             real->tree,
                                                             tag);
         }
@@ -2881,7 +2881,7 @@ gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter,
   check_invariants (iter);
 
   current_line = real->line;
-  prev_line = gtk_text_line_previous_could_contain_tag (current_line,
+  prev_line = __gtk_text_line_previous_could_contain_tag (current_line,
                                                         real->tree, tag);
 
 
@@ -2913,7 +2913,7 @@ gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter,
           if (prev_line == NULL)
             {
               /* End of search. Set to start of buffer. */
-              gtk_text_btree_get_iter_at_char (real->tree, iter, 0);
+              _gtk_text_btree_get_iter_at_char (real->tree, iter, 0);
               return FALSE;
             }
 
@@ -2929,7 +2929,7 @@ gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter,
             }
 
           current_line = real->line;
-          prev_line = gtk_text_line_previous_could_contain_tag (current_line,
+          prev_line = __gtk_text_line_previous_could_contain_tag (current_line,
                                                                 real->tree,
                                                                 tag);
         }
@@ -3046,7 +3046,7 @@ forward_chars_with_skipping (GtkTextIter *iter,
 
       if (!ignored &&
           skip_invisible &&
-          gtk_text_btree_char_is_invisible (iter))
+          _gtk_text_btree_char_is_invisible (iter))
         ignored = TRUE;
 
       gtk_text_iter_forward_char (iter);
@@ -3796,7 +3796,7 @@ gtk_text_iter_reorder         (GtkTextIter *first,
  */
 
 void
-gtk_text_btree_get_iter_at_char (GtkTextBTree *tree,
+_gtk_text_btree_get_iter_at_char (GtkTextBTree *tree,
                                  GtkTextIter *iter,
                                  gint char_index)
 {
@@ -3808,7 +3808,7 @@ gtk_text_btree_get_iter_at_char (GtkTextBTree *tree,
   g_return_if_fail (iter != NULL);
   g_return_if_fail (tree != NULL);
 
-  line = gtk_text_btree_get_line_at_char (tree, char_index,
+  line = __gtk_text_btree_get_line_at_char (tree, char_index,
                                           &line_start, &real_char_index);
 
   iter_init_from_char_offset (iter, tree, line, real_char_index - line_start);
@@ -3819,7 +3819,7 @@ gtk_text_btree_get_iter_at_char (GtkTextBTree *tree,
 }
 
 void
-gtk_text_btree_get_iter_at_line_char (GtkTextBTree *tree,
+__gtk_text_btree_get_iter_at_line_char (GtkTextBTree *tree,
                                       GtkTextIter *iter,
                                       gint line_number,
                                       gint char_on_line)
@@ -3831,7 +3831,7 @@ gtk_text_btree_get_iter_at_line_char (GtkTextBTree *tree,
   g_return_if_fail (iter != NULL);
   g_return_if_fail (tree != NULL);
 
-  line = gtk_text_btree_get_line (tree, line_number, &real_line);
+  line = _gtk_text_btree_get_line (tree, line_number, &real_line);
 
   iter_init_from_char_offset (iter, tree, line, char_on_line);
 
@@ -3842,7 +3842,7 @@ gtk_text_btree_get_iter_at_line_char (GtkTextBTree *tree,
 }
 
 void
-gtk_text_btree_get_iter_at_line_byte (GtkTextBTree   *tree,
+__gtk_text_btree_get_iter_at_line_byte (GtkTextBTree   *tree,
                                       GtkTextIter    *iter,
                                       gint            line_number,
                                       gint            byte_index)
@@ -3854,7 +3854,7 @@ gtk_text_btree_get_iter_at_line_byte (GtkTextBTree   *tree,
   g_return_if_fail (iter != NULL);
   g_return_if_fail (tree != NULL);
 
-  line = gtk_text_btree_get_line (tree, line_number, &real_line);
+  line = _gtk_text_btree_get_line (tree, line_number, &real_line);
 
   iter_init_from_byte_offset (iter, tree, line, byte_index);
 
@@ -3872,7 +3872,7 @@ gtk_text_btree_get_iter_at_line_byte (GtkTextBTree   *tree,
 }
 
 void
-gtk_text_btree_get_iter_at_line      (GtkTextBTree   *tree,
+_gtk_text_btree_get_iter_at_line      (GtkTextBTree   *tree,
                                       GtkTextIter    *iter,
                                       GtkTextLine    *line,
                                       gint            byte_offset)
@@ -3887,7 +3887,7 @@ gtk_text_btree_get_iter_at_line      (GtkTextBTree   *tree,
 }
 
 gboolean
-gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree   *tree,
+_gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree   *tree,
                                          GtkTextIter    *iter,
                                          GtkTextTag     *tag)
 {
@@ -3896,12 +3896,12 @@ gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree   *tree,
   g_return_val_if_fail (iter != NULL, FALSE);
   g_return_val_if_fail (tree != NULL, FALSE);
 
-  line = gtk_text_btree_first_could_contain_tag (tree, tag);
+  line = _gtk_text_btree_first_could_contain_tag (tree, tag);
 
   if (line == NULL)
     {
       /* Set iter to last in tree */
-      gtk_text_btree_get_last_iter (tree, iter);
+      _gtk_text_btree_get_last_iter (tree, iter);
       check_invariants (iter);
       return FALSE;
     }
@@ -3915,7 +3915,7 @@ gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree   *tree,
 }
 
 gboolean
-gtk_text_btree_get_iter_at_last_toggle  (GtkTextBTree   *tree,
+_gtk_text_btree_get_iter_at_last_toggle  (GtkTextBTree   *tree,
                                          GtkTextIter    *iter,
                                          GtkTextTag     *tag)
 {
@@ -3924,12 +3924,12 @@ gtk_text_btree_get_iter_at_last_toggle  (GtkTextBTree   *tree,
   g_return_val_if_fail (iter != NULL, FALSE);
   g_return_val_if_fail (tree != NULL, FALSE);
 
-  line = gtk_text_btree_last_could_contain_tag (tree, tag);
+  line = _gtk_text_btree_last_could_contain_tag (tree, tag);
 
   if (line == NULL)
     {
       /* Set iter to first in tree */
-      gtk_text_btree_get_iter_at_line_char (tree, iter, 0, 0);
+      __gtk_text_btree_get_iter_at_line_char (tree, iter, 0, 0);
       check_invariants (iter);
       return FALSE;
     }
@@ -3943,7 +3943,7 @@ gtk_text_btree_get_iter_at_last_toggle  (GtkTextBTree   *tree,
 }
 
 gboolean
-gtk_text_btree_get_iter_at_mark_name (GtkTextBTree *tree,
+__gtk_text_btree_get_iter_at_mark_name (GtkTextBTree *tree,
                                       GtkTextIter *iter,
                                       const gchar *mark_name)
 {
@@ -3952,20 +3952,20 @@ gtk_text_btree_get_iter_at_mark_name (GtkTextBTree *tree,
   g_return_val_if_fail (iter != NULL, FALSE);
   g_return_val_if_fail (tree != NULL, FALSE);
 
-  mark = gtk_text_btree_get_mark_by_name (tree, mark_name);
+  mark = _gtk_text_btree_get_mark_by_name (tree, mark_name);
 
   if (mark == NULL)
     return FALSE;
   else
     {
-      gtk_text_btree_get_iter_at_mark (tree, iter, mark);
+      _gtk_text_btree_get_iter_at_mark (tree, iter, mark);
       check_invariants (iter);
       return TRUE;
     }
 }
 
 void
-gtk_text_btree_get_iter_at_mark (GtkTextBTree *tree,
+_gtk_text_btree_get_iter_at_mark (GtkTextBTree *tree,
                                  GtkTextIter *iter,
                                  GtkTextMark *mark)
 {
@@ -3984,7 +3984,7 @@ gtk_text_btree_get_iter_at_mark (GtkTextBTree *tree,
 }
 
 void
-gtk_text_btree_get_iter_at_child_anchor (GtkTextBTree       *tree,
+_gtk_text_btree_get_iter_at_child_anchor (GtkTextBTree       *tree,
                                          GtkTextIter        *iter,
                                          GtkTextChildAnchor *anchor)
 {
@@ -4003,15 +4003,15 @@ gtk_text_btree_get_iter_at_child_anchor (GtkTextBTree       *tree,
 }
 
 void
-gtk_text_btree_get_last_iter         (GtkTextBTree   *tree,
+_gtk_text_btree_get_last_iter         (GtkTextBTree   *tree,
                                       GtkTextIter    *iter)
 {
   g_return_if_fail (iter != NULL);
   g_return_if_fail (tree != NULL);
 
-  gtk_text_btree_get_iter_at_char (tree,
+  _gtk_text_btree_get_iter_at_char (tree,
                                    iter,
-                                   gtk_text_btree_char_count (tree));
+                                   _gtk_text_btree_char_count (tree));
   check_invariants (iter);
 }
 
@@ -4022,7 +4022,7 @@ gtk_text_iter_spew (const GtkTextIter *iter, const gchar *desc)
 
   g_return_if_fail (iter != NULL);
 
-  if (real->chars_changed_stamp != gtk_text_btree_get_chars_changed_stamp (real->tree))
+  if (real->chars_changed_stamp != _gtk_text_btree_get_chars_changed_stamp (real->tree))
     g_print (" %20s: <invalidated iterator>\n", desc);
   else
     {
@@ -4053,14 +4053,14 @@ gtk_text_iter_check (const GtkTextIter *iter)
   g_assert (sizeof (GtkTextIter) == sizeof (GtkTextRealIter));
 
   if (real->chars_changed_stamp !=
-      gtk_text_btree_get_chars_changed_stamp (real->tree))
+      _gtk_text_btree_get_chars_changed_stamp (real->tree))
     g_error ("iterator check failed: invalid iterator");
 
   if (real->line_char_offset < 0 && real->line_byte_offset < 0)
     g_error ("iterator check failed: both char and byte offsets are invalid");
 
   segments_updated = (real->segments_changed_stamp ==
-                      gtk_text_btree_get_segments_changed_stamp (real->tree));
+                      _gtk_text_btree_get_segments_changed_stamp (real->tree));
 
 #if 0
   printf ("checking iter, segments %s updated, byte %d char %d\n",
@@ -4094,7 +4094,7 @@ gtk_text_iter_check (const GtkTextIter *iter)
 
   if (real->line_byte_offset >= 0)
     {
-      gtk_text_line_byte_locate (real->line, real->line_byte_offset,
+      _gtk_text_line_byte_locate (real->line, real->line_byte_offset,
                                  &byte_segment, &byte_any_segment,
                                  &seg_byte_offset, &line_byte_offset);
 
@@ -4125,7 +4125,7 @@ gtk_text_iter_check (const GtkTextIter *iter)
 
   if (real->line_char_offset >= 0)
     {
-      gtk_text_line_char_locate (real->line, real->line_char_offset,
+      _gtk_text_line_char_locate (real->line, real->line_char_offset,
                                  &char_segment, &char_any_segment,
                                  &seg_char_offset, &line_char_offset);
 
@@ -4195,7 +4195,7 @@ gtk_text_iter_check (const GtkTextIter *iter)
     {
       gint should_be;
 
-      should_be = gtk_text_line_get_number (real->line);
+      should_be = _gtk_text_line_get_number (real->line);
       if (real->cached_line_number != should_be)
         g_error ("wrong line number was cached");
     }
@@ -4208,7 +4208,7 @@ gtk_text_iter_check (const GtkTextIter *iter)
         {
           gint char_index;
 
-          char_index = gtk_text_line_char_index (real->line);
+          char_index = _gtk_text_line_char_index (real->line);
           char_index += real->line_char_offset;
 
           if (real->cached_char_index != char_index)
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 25d4b16c24..ee5ffb43da 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -277,7 +277,7 @@ gtk_text_layout_set_buffer (GtkTextLayout *layout,
 
   if (layout->buffer)
     {
-      gtk_text_btree_remove_view (_gtk_text_buffer_get_btree (layout->buffer),
+      _gtk_text_btree_remove_view (_gtk_text_buffer_get_btree (layout->buffer),
                                   layout);
 
       gtk_object_unref (GTK_OBJECT (layout->buffer));
@@ -291,7 +291,7 @@ gtk_text_layout_set_buffer (GtkTextLayout *layout,
       gtk_object_sink (GTK_OBJECT (buffer));
       gtk_object_ref (GTK_OBJECT (buffer));
 
-      gtk_text_btree_add_view (_gtk_text_buffer_get_btree (buffer), layout);
+      _gtk_text_btree_add_view (_gtk_text_buffer_get_btree (buffer), layout);
     }
 }
 
@@ -464,11 +464,11 @@ gtk_text_layout_set_preedit_string (GtkTextLayout *layout,
 				    gtk_text_buffer_get_mark (layout->buffer, "insert"));
   
   line = gtk_text_iter_get_text_line (&iter);
-  line_data = gtk_text_line_get_data (line, layout);
+  line_data = _gtk_text_line_get_data (line, layout);
   if (line_data)
     {
       gtk_text_layout_invalidate_cache (layout, line);
-      gtk_text_line_invalidate_wrap (line, line_data);
+      _gtk_text_line_invalidate_wrap (line, line_data);
       gtk_text_layout_invalidated (layout);
     }
 }
@@ -547,7 +547,7 @@ gtk_text_layout_get_lines (GtkTextLayout *layout,
   retval = NULL;
 
   first_btree_line =
-    gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
+    _gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
                                    layout, top_y, first_line_y);
   if (first_btree_line == NULL)
     {
@@ -558,17 +558,17 @@ gtk_text_layout_get_lines (GtkTextLayout *layout,
 
   /* -1 since bottom_y is one past */
   last_btree_line =
-    gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
+    _gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
                                    layout, bottom_y - 1, NULL);
 
   if (!last_btree_line)
     last_btree_line =
-      gtk_text_btree_get_line (_gtk_text_buffer_get_btree (layout->buffer),
-                               gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1,
+      _gtk_text_btree_get_line (_gtk_text_buffer_get_btree (layout->buffer),
+                               _gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1,
                                NULL);
 
   {
-    GtkTextLineData *ld = gtk_text_line_get_data (last_btree_line, layout);
+    GtkTextLineData *ld = _gtk_text_line_get_data (last_btree_line, layout);
     if (ld->height == 0)
       G_BREAKPOINT ();
   }
@@ -583,7 +583,7 @@ gtk_text_layout_get_lines (GtkTextLayout *layout,
       if (line == last_btree_line)
         break;
 
-      line = gtk_text_line_next (line);
+      line = _gtk_text_line_next (line);
     }
 
   retval = g_slist_reverse (retval);
@@ -675,19 +675,19 @@ gtk_text_layout_real_invalidate (GtkTextLayout *layout,
 
   while (TRUE)
     {
-      GtkTextLineData *line_data = gtk_text_line_get_data (line, layout);
+      GtkTextLineData *line_data = _gtk_text_line_get_data (line, layout);
 
       if (line_data &&
           (line != last_line || !gtk_text_iter_starts_line (end)))
         {
           gtk_text_layout_invalidate_cache (layout, line);
-          gtk_text_line_invalidate_wrap (line, line_data);
+          _gtk_text_line_invalidate_wrap (line, line_data);
         }
 
       if (line == last_line)
         break;
 
-      line = gtk_text_line_next (line);
+      line = _gtk_text_line_next (line);
     }
 
   gtk_text_layout_invalidated (layout);
@@ -724,14 +724,14 @@ gtk_text_layout_is_valid (GtkTextLayout *layout)
   g_return_val_if_fail (layout != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), FALSE);
 
-  return gtk_text_btree_is_valid (_gtk_text_buffer_get_btree (layout->buffer),
+  return _gtk_text_btree_is_valid (_gtk_text_buffer_get_btree (layout->buffer),
                                   layout);
 }
 
 static void
 update_layout_size (GtkTextLayout *layout)
 {
-  gtk_text_btree_get_view_size (_gtk_text_buffer_get_btree (layout->buffer),
+  _gtk_text_btree_get_view_size (_gtk_text_buffer_get_btree (layout->buffer),
 				layout,
 				&layout->width, &layout->height);
 }
@@ -779,14 +779,14 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
   seen = 0;
   while (line && seen < -y0)
     {
-      GtkTextLineData *line_data = gtk_text_line_get_data (line, layout);
+      GtkTextLineData *line_data = _gtk_text_line_get_data (line, layout);
       if (!line_data || !line_data->valid)
         {
           gint old_height = line_data ? line_data->height : 0;
 
-          gtk_text_btree_validate_line (_gtk_text_buffer_get_btree (layout->buffer),
+          __gtk_text_btree_validate_line (_gtk_text_buffer_get_btree (layout->buffer),
                                         line, layout);
-          line_data = gtk_text_line_get_data (line, layout);
+          line_data = _gtk_text_line_get_data (line, layout);
 
           delta_height += line_data->height - old_height;
           
@@ -800,7 +800,7 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
         }
 
       seen += line_data->height;
-      line = gtk_text_line_previous (line);
+      line = _gtk_text_line_previous (line);
     }
 
   /* Validate forwards to y1 */
@@ -808,14 +808,14 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
   seen = 0;
   while (line && seen < y1)
     {
-      GtkTextLineData *line_data = gtk_text_line_get_data (line, layout);
+      GtkTextLineData *line_data = _gtk_text_line_get_data (line, layout);
       if (!line_data || !line_data->valid)
         {
           gint old_height = line_data ? line_data->height : 0;
 
-          gtk_text_btree_validate_line (_gtk_text_buffer_get_btree (layout->buffer),
+          __gtk_text_btree_validate_line (_gtk_text_buffer_get_btree (layout->buffer),
                                         line, layout);
-          line_data = gtk_text_line_get_data (line, layout);
+          line_data = _gtk_text_line_get_data (line, layout);
 
           delta_height += line_data->height - old_height;
           
@@ -829,7 +829,7 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
         }
 
       seen += line_data->height;
-      line = gtk_text_line_next (line);
+      line = _gtk_text_line_next (line);
     }
 
   /* If we found and validated any invalid lines, update size and
@@ -841,7 +841,7 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
 
       update_layout_size (layout);
 
-      line_top = gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
+      line_top = _gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
 					       first_line, layout);
 
       gtk_text_layout_changed (layout,
@@ -870,7 +870,7 @@ gtk_text_layout_validate (GtkTextLayout *layout,
   g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
 
   while (max_pixels > 0 &&
-         gtk_text_btree_validate (_gtk_text_buffer_get_btree (layout->buffer),
+         _gtk_text_btree_validate (_gtk_text_buffer_get_btree (layout->buffer),
                                   layout,  max_pixels,
                                   &y, &old_height, &new_height))
     {
@@ -894,7 +894,7 @@ gtk_text_layout_real_wrap (GtkTextLayout   *layout,
   if (line_data == NULL)
     {
       line_data = gtk_text_line_data_new (layout, line);
-      gtk_text_line_add_data (line, line_data);
+      _gtk_text_line_add_data (line, line_data);
     }
 
   display = gtk_text_layout_get_line_display (layout, line, TRUE);
@@ -933,7 +933,7 @@ get_style (GtkTextLayout *layout,
   g_assert (layout->one_style_cache == NULL);
 
   /* Get the tags at this spot */
-  tags = gtk_text_btree_get_tags (iter, &tag_count);
+  tags = _gtk_text_btree_get_tags (iter, &tag_count);
 
   /* No tags, use default style */
   if (tags == NULL || tag_count == 0)
@@ -1010,10 +1010,10 @@ totally_invisible_line (GtkTextLayout *layout,
      function can use the whole btree to get it right. */
   else
     {
-      gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+      _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
                                        iter, line, 0);
 
-      if (!gtk_text_btree_char_is_invisible (iter))
+      if (!_gtk_text_btree_char_is_invisible (iter))
         return FALSE;
     }
 
@@ -1396,7 +1396,7 @@ add_cursor (GtkTextLayout      *layout,
   /* Hide insertion cursor when we have a selection or the layout
    * user has hidden the cursor.
    */
-  if (gtk_text_btree_mark_is_insert (_gtk_text_buffer_get_btree (layout->buffer),
+  if (_gtk_text_btree_mark_is_insert (_gtk_text_buffer_get_btree (layout->buffer),
                                      seg->body.mark.obj) &&
       (!layout->cursor_visible ||
        gtk_text_buffer_get_selection_bounds (layout->buffer, NULL, NULL)))
@@ -1622,7 +1622,7 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
   display->line = line;
   display->insert_index = -1;
 
-  gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+  _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
                                    &iter, line, 0);
 
   /* Special-case optimization for completely
@@ -1634,7 +1634,7 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
 
   /* Allocate space for flat text for buffer
    */
-  byte_count = gtk_text_line_byte_count (line);
+  byte_count = _gtk_text_line_byte_count (line);
   text = g_malloc (byte_count);
 
   attrs = pango_attr_list_new ();
@@ -1649,7 +1649,7 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
           seg->type == &gtk_text_pixbuf_type ||
           seg->type == &gtk_text_child_type)
         {
-          gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+          _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
                                            &iter, line,
                                            byte_offset);
           style = get_style (layout, &iter);
@@ -1700,7 +1700,7 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
  			   */
 
  			  if (layout->preedit_len > 0 &&
- 			      gtk_text_btree_mark_is_insert (_gtk_text_buffer_get_btree (layout->buffer),
+ 			      _gtk_text_btree_mark_is_insert (_gtk_text_buffer_get_btree (layout->buffer),
  							     seg->body.mark.obj))
 			    break;
 
@@ -1778,7 +1778,7 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
  	  
 	  /* At the insertion point, add the preedit string, if any */
 	  
-	  if (gtk_text_btree_mark_is_insert (_gtk_text_buffer_get_btree (layout->buffer),
+	  if (_gtk_text_btree_mark_is_insert (_gtk_text_buffer_get_btree (layout->buffer),
 					     seg->body.mark.obj))
 	    {
 	      display->insert_index = byte_offset;
@@ -1942,7 +1942,7 @@ line_display_index_to_iter (GtkTextLayout      *layout,
       trailing = 0;
     }
   
-  gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+  _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
                                    iter, display->line, index);
   gtk_text_iter_forward_chars (iter, trailing);
 }
@@ -1976,15 +1976,15 @@ get_line_at_y (GtkTextLayout *layout,
   if (y > layout->height)
     y = layout->height;
 
-  *line = gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
+  *line = _gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
                                          layout, y, line_top);
   if (*line == NULL)
     {
-      *line = gtk_text_btree_get_line (_gtk_text_buffer_get_btree (layout->buffer),
-                                       gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1, NULL);
+      *line = _gtk_text_btree_get_line (_gtk_text_buffer_get_btree (layout->buffer),
+                                       _gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1, NULL);
       if (line_top)
         *line_top =
-          gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
+          _gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
                                         *line, layout);
     }
 }
@@ -2012,7 +2012,7 @@ gtk_text_layout_get_line_at_y (GtkTextLayout *layout,
   g_return_if_fail (target_iter != NULL);
 
   get_line_at_y (layout, y, &line, line_top);
-  gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+  _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
                                    target_iter, line, 0);
 }
 
@@ -2052,7 +2052,7 @@ gtk_text_layout_get_iter_at_pixel (GtkTextLayout *layout,
   if (!pango_layout_xy_to_index (display->layout, x * PANGO_SCALE, y * PANGO_SCALE,
                                  &byte_index, &trailing))
     {
-      byte_index = gtk_text_line_byte_count (line);
+      byte_index = _gtk_text_line_byte_count (line);
       trailing = 0;
     }
 
@@ -2098,7 +2098,7 @@ gtk_text_layout_get_cursor_locations (GtkTextLayout  *layout,
   display = gtk_text_layout_get_line_display (layout, line, FALSE);
   index = line_display_iter_to_index (layout, display, iter);
   
-  line_top = gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
+  line_top = _gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
                                            line, layout);
   
   pango_layout_get_cursor_pos (display->layout, index,
@@ -2150,11 +2150,11 @@ gtk_text_layout_get_line_yrange (GtkTextLayout     *layout,
   line = gtk_text_iter_get_text_line (iter);
 
   if (y)
-    *y = gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
+    *y = _gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
                                        line, layout);
   if (height)
     {
-      GtkTextLineData *line_data = gtk_text_line_get_data (line, layout);
+      GtkTextLineData *line_data = _gtk_text_line_get_data (line, layout);
       if (line_data)
         *height = line_data->height;
       else
@@ -2183,7 +2183,7 @@ gtk_text_layout_get_iter_location (GtkTextLayout     *layout,
 
   display = gtk_text_layout_get_line_display (layout, line, FALSE);
 
-  rect->y = gtk_text_btree_find_line_top (tree, line, layout);
+  rect->y = _gtk_text_btree_find_line_top (tree, line, layout);
 
   x_offset = display->x_offset * PANGO_SCALE;
 
@@ -2215,16 +2215,16 @@ find_display_line_below (GtkTextLayout *layout,
   gint line_top;
   gint found_byte = 0;
 
-  line = gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
+  line = _gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
                                         layout, y, &line_top);
   if (!line)
     {
       line =
-        gtk_text_btree_get_line (_gtk_text_buffer_get_btree (layout->buffer),
-                                 gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1,
+        _gtk_text_btree_get_line (_gtk_text_buffer_get_btree (layout->buffer),
+                                 _gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1,
                                  NULL);
       line_top =
-        gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
+        _gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
                                       line, layout);
     }
 
@@ -2260,14 +2260,14 @@ find_display_line_below (GtkTextLayout *layout,
       line_top += display->bottom_margin;
       gtk_text_layout_free_line_display (layout, display);
 
-      next = gtk_text_line_next (line);
+      next = _gtk_text_line_next (line);
       if (!next)
         found_line = line;
 
       line = next;
     }
 
-  gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+  _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
                                    iter, found_line, found_byte);
 }
 
@@ -2285,12 +2285,12 @@ find_display_line_above (GtkTextLayout *layout,
   gint line_top;
   gint found_byte = 0;
 
-  line = gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer), layout, y, &line_top);
+  line = _gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer), layout, y, &line_top);
   if (!line)
     {
-      line = gtk_text_btree_get_line (_gtk_text_buffer_get_btree (layout->buffer),
-                                      gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1, NULL);
-      line_top = gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer), line, layout);
+      line = _gtk_text_btree_get_line (_gtk_text_buffer_get_btree (layout->buffer),
+                                      _gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1, NULL);
+      line_top = _gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer), line, layout);
     }
 
   while (line && !found_line)
@@ -2331,13 +2331,13 @@ find_display_line_above (GtkTextLayout *layout,
       
       gtk_text_layout_free_line_display (layout, display);
 
-      line = gtk_text_line_previous (line);
+      line = _gtk_text_line_previous (line);
     }
 
  done:
   
   if (found_line)
-    gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+    _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
                                      iter, found_line, found_byte);
   else
     gtk_text_buffer_get_iter_at_offset (layout->buffer, iter, 0);
@@ -2423,7 +2423,7 @@ gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout,
 
   if (line_byte < layout_line->length || !tmp_list->next) /* first line of paragraph */
     {
-      GtkTextLine *prev_line = gtk_text_line_previous (line);
+      GtkTextLine *prev_line = _gtk_text_line_previous (line);
 
       if (prev_line)
         {
@@ -2534,7 +2534,7 @@ gtk_text_layout_move_iter_to_next_line (GtkTextLayout *layout,
 
       gtk_text_layout_free_line_display (layout, display);
 
-      line = gtk_text_line_next (line);
+      line = _gtk_text_line_next (line);
     }
 
   return
@@ -2751,7 +2751,7 @@ gtk_text_layout_move_iter_visually (GtkTextLayout *layout,
       gint line_byte;
       gint extra_back = 0;
 
-      int byte_count = gtk_text_line_byte_count (line);
+      int byte_count = _gtk_text_line_byte_count (line);
 
       int new_index;
       int new_trailing;
@@ -2790,18 +2790,18 @@ gtk_text_layout_move_iter_visually (GtkTextLayout *layout,
       
       if (new_index < 0 || (new_index == 0 && extra_back))
         {
-          line = gtk_text_line_previous (line);
+          line = _gtk_text_line_previous (line);
 
           if (!line)
             goto done;
           
  	  gtk_text_layout_free_line_display (layout, display);
  	  display = gtk_text_layout_get_line_display (layout, line, FALSE);
-          new_index = gtk_text_line_byte_count (line);
+          new_index = _gtk_text_line_byte_count (line);
         }
       else if (new_index > byte_count)
         {
-          line = gtk_text_line_next (line);
+          line = _gtk_text_line_next (line);
           if (!line)
             goto done;
 
diff --git a/gtk/gtktextmark.c b/gtk/gtktextmark.c
index e18ea3295e..f4dae7c996 100644
--- a/gtk/gtktextmark.c
+++ b/gtk/gtktextmark.c
@@ -210,7 +210,7 @@ gtk_text_mark_get_buffer (GtkTextMark *mark)
   if (seg->body.mark.tree == NULL)
     return NULL;
   else
-    return gtk_text_btree_get_buffer (seg->body.mark.tree);
+    return _gtk_text_btree_get_buffer (seg->body.mark.tree);
 }
 
 /*
diff --git a/gtk/gtktextsegment.c b/gtk/gtktextsegment.c
index 33d1083317..2a4bce96fa 100644
--- a/gtk/gtktextsegment.c
+++ b/gtk/gtktextsegment.c
@@ -121,7 +121,7 @@ gtk_text_line_segment_split (const GtkTextIter *iter)
               g_assert (count != seg->byte_count);
               g_assert (seg->byte_count > 0);
 
-              gtk_text_btree_segments_changed (tree);
+              _gtk_text_btree_segments_changed (tree);
 
               seg = (*seg->type->splitFunc)(seg, count);