diff --git a/src/i830.h b/src/i830.h
index 8482ca97..46cdd6cd 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -430,14 +430,8 @@ extern Bool i830_crtc_on(xf86CrtcPtr crtc);
 extern int i830_crtc_to_pipe(xf86CrtcPtr crtc);
 extern Bool I830AccelInit(ScreenPtr pScreen);
 
-i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name,
-				  unsigned long size, unsigned long pitch,
-				  int flags, uint32_t tile_format);
 void i830_reset_allocations(ScrnInfoPtr scrn);
-void i830_free_3d_memory(ScrnInfoPtr scrn);
-void i830_free_memory(ScrnInfoPtr scrn, i830_memory * mem);
 Bool i830_allocate_2d_memory(ScrnInfoPtr scrn);
-Bool i830_allocate_3d_memory(ScrnInfoPtr scrn);
 void i830_init_bufmgr(ScrnInfoPtr scrn);
 #ifdef INTEL_XVMC
 Bool i830_allocate_xvmc_buffer(ScrnInfoPtr scrn, const char *name,
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 089667d1..c6003a5a 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -163,7 +163,7 @@ i830_check_display_stride(ScrnInfoPtr scrn, int stride, Bool tiling)
 		return FALSE;
 }
 
-void i830_free_memory(ScrnInfoPtr scrn, i830_memory * mem)
+static void i830_free_memory(ScrnInfoPtr scrn, i830_memory * mem)
 {
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 
@@ -228,7 +228,7 @@ void i830_reset_allocations(ScrnInfoPtr scrn)
  *   the entire Screen lifetime.  This means not using buffer objects, which
  *   get their offsets chosen at each EnterVT time.
  */
-i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name,
+static i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name,
 				  unsigned long size, unsigned long pitch,
 				  int flags, uint32_t tiling_mode)
 {