diff --git a/ChangeLog b/ChangeLog
index 6d292a3c50..4d54328941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-12-28  Sven Neumann  <sven@gimp.org>
+
+	* app/widgets/gimprender.h: removed GIMP_RENDER_BUF_WIDTH and
+	GIMP_RENDER_BUF_HEIGHT definitions.
+
+	* app/display/gimpdisplayshell.h: define the size of the display
+	render buffer here.
+
+	* app/display/gimpdisplayshell.c
+	* app/display/gimpdisplayshell-draw.c
+	* app/widgets/gimprender.c: changed accordingly.
+
 2007-12-28  Sven Neumann  <sven@gimp.org>
 
 	* app/widgets/gimpcolormapeditor.c: don't use the render buffer.
diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c
index f1030c703d..f80fab39e5 100644
--- a/app/display/gimpdisplayshell-draw.c
+++ b/app/display/gimpdisplayshell-draw.c
@@ -40,7 +40,6 @@
 #include "vectors/gimpstroke.h"
 #include "vectors/gimpvectors.h"
 
-#include "widgets/gimprender.h"
 #include "widgets/gimpwidgets-utils.h"
 
 #include "gimpcanvas.h"
@@ -564,14 +563,14 @@ gimp_display_shell_draw_area (GimpDisplayShell *shell,
       /*  display the image in RENDER_BUF_WIDTH x RENDER_BUF_HEIGHT
        *  sized chunks
        */
-      for (i = y; i < y2; i += GIMP_RENDER_BUF_HEIGHT)
+      for (i = y; i < y2; i += GIMP_DISPLAY_RENDER_BUF_HEIGHT)
         {
-          for (j = x; j < x2; j += GIMP_RENDER_BUF_WIDTH)
+          for (j = x; j < x2; j += GIMP_DISPLAY_RENDER_BUF_WIDTH)
             {
               gint dx, dy;
 
-              dx = MIN (x2 - j, GIMP_RENDER_BUF_WIDTH);
-              dy = MIN (y2 - i, GIMP_RENDER_BUF_HEIGHT);
+              dx = MIN (x2 - j, GIMP_DISPLAY_RENDER_BUF_WIDTH);
+              dy = MIN (y2 - i, GIMP_DISPLAY_RENDER_BUF_HEIGHT);
 
               gimp_display_shell_render (shell,
                                          j - shell->disp_xoffset,
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index 794cee9e63..114526cade 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -46,7 +46,6 @@
 #include "core/gimpmarshal.h"
 #include "core/gimpsamplepoint.h"
 
-#include "widgets/gimprender.h"
 #include "widgets/gimphelp-ids.h"
 #include "widgets/gimpmenufactory.h"
 #include "widgets/gimpuimanager.h"
@@ -278,8 +277,8 @@ gimp_display_shell_init (GimpDisplayShell *shell)
   shell->statusbar              = NULL;
 
   shell->render_buf             = g_new (guchar,
-                                         GIMP_RENDER_BUF_WIDTH  *
-                                         GIMP_RENDER_BUF_HEIGHT * 3);
+                                         GIMP_DISPLAY_RENDER_BUF_WIDTH  *
+                                         GIMP_DISPLAY_RENDER_BUF_HEIGHT * 3);
 
   shell->title_idle_id          = 0;
 
diff --git a/app/display/gimpdisplayshell.h b/app/display/gimpdisplayshell.h
index 11c29e0767..1eef059925 100644
--- a/app/display/gimpdisplayshell.h
+++ b/app/display/gimpdisplayshell.h
@@ -46,6 +46,10 @@
 #define  FUNSCALEX(s,x)   ((x) / (s)->scale_x)
 #define  FUNSCALEY(s,y)   ((y) / (s)->scale_y)
 
+/*  the size of the display render buffer  */
+#define GIMP_DISPLAY_RENDER_BUF_WIDTH  256
+#define GIMP_DISPLAY_RENDER_BUF_HEIGHT 256
+
 
 #define GIMP_TYPE_DISPLAY_SHELL            (gimp_display_shell_get_type ())
 #define GIMP_DISPLAY_SHELL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DISPLAY_SHELL, GimpDisplayShell))
diff --git a/app/widgets/gimprender.c b/app/widgets/gimprender.c
index 243599c564..64da018923 100644
--- a/app/widgets/gimprender.c
+++ b/app/widgets/gimprender.c
@@ -168,8 +168,7 @@ gimp_render_setup_notify (gpointer    config,
   g_free (gimp_render_empty_buf);
   g_free (gimp_render_white_buf);
 
-#define BUF_SIZE (MAX (GIMP_RENDER_BUF_WIDTH, \
-                       GIMP_VIEWABLE_MAX_PREVIEW_SIZE) + 4)
+#define BUF_SIZE (GIMP_VIEWABLE_MAX_PREVIEW_SIZE + 4)
 
   gimp_render_check_buf = g_new  (guchar, BUF_SIZE * 3);
   gimp_render_empty_buf = g_new0 (guchar, BUF_SIZE * 3);
diff --git a/app/widgets/gimprender.h b/app/widgets/gimprender.h
index 85e1b76bf1..5f80e7b605 100644
--- a/app/widgets/gimprender.h
+++ b/app/widgets/gimprender.h
@@ -20,9 +20,6 @@
 #define __GIMP_RENDER_H__
 
 
-#define GIMP_RENDER_BUF_WIDTH  256
-#define GIMP_RENDER_BUF_HEIGHT 256
-
 /* buffers that contain pre-rendered patterns/colors */
 extern guchar *gimp_render_check_buf;
 extern guchar *gimp_render_empty_buf;