diff --git a/src/gallium/drivers/llvmpipe/lp_tile_size.h b/src/gallium/drivers/llvmpipe/lp_limits.h
similarity index 94%
rename from src/gallium/drivers/llvmpipe/lp_tile_size.h
rename to src/gallium/drivers/llvmpipe/lp_limits.h
index 64d5dc18a3b..75be000f2fe 100644
--- a/src/gallium/drivers/llvmpipe/lp_tile_size.h
+++ b/src/gallium/drivers/llvmpipe/lp_limits.h
@@ -25,8 +25,12 @@
  * 
  **************************************************************************/
 
-#ifndef LP_TILE_SIZE_H
-#define LP_TILE_SIZE_H
+/**
+ * Implementation limits for LLVMpipe driver.
+ */
+
+#ifndef LP_LIMITS_H
+#define LP_LIMITS_H
 
 
 /**
@@ -54,4 +58,4 @@
 #define MAXWIDTH  (1 << (LP_MAX_TEXTURE_LEVELS - 1))
 
 
-#endif
+#endif /* LP_LIMITS_H */
diff --git a/src/gallium/drivers/llvmpipe/lp_surface.c b/src/gallium/drivers/llvmpipe/lp_surface.c
index 1a116989d4c..ca03440d5d6 100644
--- a/src/gallium/drivers/llvmpipe/lp_surface.c
+++ b/src/gallium/drivers/llvmpipe/lp_surface.c
@@ -28,9 +28,9 @@
 #include "util/u_rect.h"
 #include "lp_context.h"
 #include "lp_flush.h"
+#include "lp_limits.h"
 #include "lp_surface.h"
 #include "lp_texture.h"
-#include "lp_tile_size.h"
 
 
 /**
diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c
index 336b487bd4e..0c66f4ad503 100644
--- a/src/gallium/drivers/llvmpipe/lp_texture.c
+++ b/src/gallium/drivers/llvmpipe/lp_texture.c
@@ -47,7 +47,6 @@
 #include "lp_tile_image.h"
 #include "lp_texture.h"
 #include "lp_setup.h"
-#include "lp_tile_size.h"
 
 #include "state_tracker/sw_winsys.h"
 
diff --git a/src/gallium/drivers/llvmpipe/lp_texture.h b/src/gallium/drivers/llvmpipe/lp_texture.h
index 3026afe0a5b..7d0ae263e51 100644
--- a/src/gallium/drivers/llvmpipe/lp_texture.h
+++ b/src/gallium/drivers/llvmpipe/lp_texture.h
@@ -31,7 +31,7 @@
 
 #include "pipe/p_state.h"
 #include "util/u_debug.h"
-#include "lp_tile_size.h"
+#include "lp_limits.h"
 
 
 enum lp_texture_usage
diff --git a/src/gallium/drivers/llvmpipe/lp_tile_soa.h b/src/gallium/drivers/llvmpipe/lp_tile_soa.h
index 9d6a88afec5..634d8dfb1ce 100644
--- a/src/gallium/drivers/llvmpipe/lp_tile_soa.h
+++ b/src/gallium/drivers/llvmpipe/lp_tile_soa.h
@@ -30,7 +30,7 @@
 
 #include "pipe/p_compiler.h"
 #include "tgsi/tgsi_exec.h" /* for NUM_CHANNELS */
-#include "lp_tile_size.h"
+#include "lp_limits.h"
 
 #ifdef __cplusplus
 extern "C" {