-new_sources := iopen.c iopen.h
-ldiskfs_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources)
+new_sources := iopen.c iopen.h extents.c mballoc.c
+new_headers := ext3_extents.h
+ldiskfs_patched_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources) $(new_headers)
+ldiskfs_sources := $(ldiskfs_patched_sources)
+
+quotafmt_sources := lustre_quota_fmt.c
+quotafmt_headers := lustre_quota_fmt.h
+@QUOTA_TRUE@ldiskfs_sources += $(quotafmt_sources) $(quotafmt_headers)