diff --git a/GL/glx/impsize.h b/GL/glx/impsize.h
index 1bef03d21..a04f49cf3 100644
--- a/GL/glx/impsize.h
+++ b/GL/glx/impsize.h
@@ -48,30 +48,10 @@
 ** itself), but we thought it was better to call these routines than to
 ** replicate the code in here.
 */
-extern int __glCallLists_size(GLsizei n, GLenum type);
-extern int __glColorTableParameterfv_size(GLenum pname);
-extern int __glColorTableParameteriv_size(GLenum pname);
-extern int __glConvolutionParameterfv_size(GLenum pname);
-extern int __glConvolutionParameteriv_size(GLenum pname);
+
+#include "indirect_size.h"
+
 extern int __glDrawPixels_size(GLenum format, GLenum type, GLsizei w,GLsizei h);
-extern int __glFogfv_size(GLenum pname);
-extern int __glFogiv_size(GLenum pname);
-extern int __glLightModelfv_size(GLenum pname);
-extern int __glLightModeliv_size(GLenum pname);
-extern int __glLightfv_size(GLenum pname);
-extern int __glLightiv_size(GLenum pname);
-extern int __glMaterialfv_size(GLenum pname);
-extern int __glMaterialiv_size(GLenum pname);
-extern int __glTexEnvfv_size(GLenum e);
-extern int __glTexEnviv_size(GLenum e);
-extern int __glTexGendv_size(GLenum e);
-extern int __glTexGenfv_size(GLenum e);
-extern int __glTexGeniv_size(GLenum pname);
-extern int __glTexParameterfv_size(GLenum e);
-extern int __glTexParameteriv_size(GLenum e);
 extern int __glEvalComputeK(GLenum target);
 
-extern int __glPointParameterfvEXT_size(GLenum e);
-extern int __glPointParameterivNV_size(GLenum e);
-
 #endif /* _impsize_h_ */
diff --git a/GL/glx/rensize.c b/GL/glx/rensize.c
index 29d545e4c..b49520ad5 100644
--- a/GL/glx/rensize.c
+++ b/GL/glx/rensize.c
@@ -57,7 +57,7 @@ int __glXCallListsReqSize(GLbyte *pc, Bool swap )
 	n = SWAPL( n );
 	type = SWAPL( type );
     }
-    return __glCallLists_size( n, type );	/* defined in samplegl lib */
+    return n * __glCallLists_size( type );
 }
 
 int __glXFogivReqSize(GLbyte *pc, Bool swap )