diff --git a/ChangeLog b/ChangeLog
index d52bb6d429..430b61967c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-21  Michael Natterer  <mitch@gimp.org>
+
+	* app/tools/gimpeditselectiontool.c
+	* app/tools/gimpiscissorstool.c
+	* app/tools/gimptexttool.c
+	* app/tools/gimptransformtool.c: use accessors for drawable and
+	item properties.
+
 2007-12-21  Michael Natterer  <mitch@gimp.org>
 
 	* app/xcf/xcf-save.c
diff --git a/app/tools/gimpeditselectiontool.c b/app/tools/gimpeditselectiontool.c
index 3e4d46767b..1fd10ea699 100644
--- a/app/tools/gimpeditselectiontool.c
+++ b/app/tools/gimpeditselectiontool.c
@@ -735,8 +735,8 @@ gimp_edit_selection_tool_draw (GimpDrawTool *draw_tool)
                                            FALSE,
                                            edit_select->cumlx + off_x,
                                            edit_select->cumly + off_y,
-                                           active_item->width,
-                                           active_item->height,
+                                           gimp_item_width  (active_item),
+                                           gimp_item_height (active_item),
                                            FALSE);
           }
       }
diff --git a/app/tools/gimpiscissorstool.c b/app/tools/gimpiscissorstool.c
index a9733542bd..8726c44b2a 100644
--- a/app/tools/gimpiscissorstool.c
+++ b/app/tools/gimpiscissorstool.c
@@ -532,7 +532,8 @@ iscissors_convert (GimpIscissorsTool *iscissors,
   iscissors->mask = gimp_channel_new_mask (display->image,
                                            display->image->width,
                                            display->image->height);
-  gimp_scan_convert_render (sc, GIMP_DRAWABLE (iscissors->mask)->tiles,
+  gimp_scan_convert_render (sc,
+                            gimp_drawable_get_tiles (GIMP_DRAWABLE (iscissors->mask)),
                             0, 0, options->antialias);
   gimp_scan_convert_free (sc);
 }
diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c
index be15b5328f..ce17cb72ac 100644
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@@ -280,8 +280,8 @@ gimp_text_tool_button_press (GimpTool        *tool,
       coords->x -= item->offset_x;
       coords->y -= item->offset_y;
 
-      if (coords->x > 0 && coords->x < item->width &&
-          coords->y > 0 && coords->y < item->height)
+      if (coords->x > 0 && coords->x < gimp_item_width  (item) &&
+          coords->y > 0 && coords->y < gimp_item_height (item))
         {
           /*  did the user click on a text layer?  */
           if (gimp_text_tool_set_drawable (text_tool, drawable, TRUE))
diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c
index 4ea7026348..231798fa17 100644
--- a/app/tools/gimptransformtool.c
+++ b/app/tools/gimptransformtool.c
@@ -1216,7 +1216,7 @@ gimp_transform_tool_doit (GimpTransformTool *tr_tool,
       break;
 
     case GIMP_TRANSFORM_TYPE_SELECTION:
-      tr_tool->original = tile_manager_ref (GIMP_DRAWABLE (active_item)->tiles);
+      tr_tool->original = tile_manager_ref (gimp_drawable_get_tiles (GIMP_DRAWABLE (active_item)));
       tile_manager_set_offsets (tr_tool->original, 0, 0);
       break;