Index: linux-2.6.10/include/linux/ext3_fs_sb.h
===================================================================
--- linux-2.6.10.orig/include/linux/ext3_fs_sb.h	2004-12-25 05:35:28.000000000 +0800
+++ linux-2.6.10/include/linux/ext3_fs_sb.h	2005-03-31 18:44:21.076648984 +0800
@@ -19,9 +19,12 @@
 #ifdef __KERNEL__
 #include <linux/timer.h>
 #include <linux/wait.h>
+#ifndef EXT_INCLUDE
+#define EXT_INCLUDE
 #include <linux/blockgroup_lock.h>
 #include <linux/percpu_counter.h>
 #endif
+#endif
 #include <linux/rbtree.h>
 
 /*