diff -ur drbd-0.7-pre8-cvs/drbd/drbd/Makefile-2.4 /usr/src/drbd/drbd/Makefile-2.4
--- drbd-0.7-pre8-cvs/drbd/drbd/Makefile-2.4	2004-06-20 17:25:17.000000000 +0200
+++ /usr/src/drbd/drbd/Makefile-2.4	2004-06-19 09:51:36.000000000 +0200
@@ -1,4 +1,4 @@
-drbd-objs  := drbd_fs.o drbd_proc.o drbd_dsender.o \
+drbd-objs  := drbd_bitmap.o drbd_fs.o drbd_proc.o drbd_dsender.o \
 	      drbd_receiver.o drbd_req-2.4.o drbd_actlog.o \
 	      lru_cache.o mempool-2.4.o drbd_main.o
 obj-$(CONFIG_BLK_DEV_DRBD)     += drbd.o

diff -ur drbd-0.7-pre8-cvs/drbd/drbd/drbd_bitmap.c /usr/src/drbd/drbd/drbd_bitmap.c
--- drbd-0.7-pre8-cvs/drbd/drbd/drbd_bitmap.c	2004-06-20 17:25:18.000000000 +0200
+++ /usr/src/drbd/drbd/drbd_bitmap.c	2004-06-19 11:32:42.000000000 +0200
@@ -5,6 +5,8 @@
 #include <linux/drbd.h>
 #include "drbd_int.h"
 
+#define ALIGN(x,s) (((x) + (s - 1)) & ~(s - 1))
+
 /* OPAQUE outside this file!
  * interface defined in drbd_int.h
  *

diff -ur drbd-0.7-pre8-cvs/drbd/drbd/drbd_compat_wrappers.h /usr/src/drbd/drbd/drbd_compat_wrappers.h
--- drbd-0.7-pre8-cvs/drbd/drbd/drbd_compat_wrappers.h	2004-06-20 17:25:23.000000000 +0200
+++ /usr/src/drbd/drbd/drbd_compat_wrappers.h	2004-06-19 09:52:05.000000000 +0200
@@ -13,6 +13,8 @@
 extern void drbd_dio_end            (struct buffer_head *bh, int uptodate);
 extern void drbd_read_bi_end_io     (struct buffer_head *bh, int uptodate);
 
+//drbd_dev *mdev = drbd_conf -1 ;
+
 /*
  * because in 2.6.x [sg]et_capacity operate on gendisk->capacity, which is in
  * units of 512 bytes sectors, these wrappers have a <<1 or >>1 where
@@ -244,6 +246,8 @@
 
 static inline void drbd_generic_make_request(int rw, struct buffer_head *bh)
 {
+	drbd_dev *mdev = drbd_conf -1 ;
+	
 	if (!bh->b_rdev) {
 		if (DRBD_ratelimit(5*HZ,5)) {
 			printk(KERN_ERR "drbd_generic_make_request: bh->b_rdev == NULL\n");

diff -ur drbd-0.7-pre8-cvs/drbd/drbd/drbd_int.h /usr/src/drbd/drbd/drbd_int.h
--- drbd-0.7-pre8-cvs/drbd/drbd/drbd_int.h	2004-06-20 17:25:29.000000000 +0200
+++ /usr/src/drbd/drbd/drbd_int.h	2004-06-19 11:31:04.000000000 +0200
@@ -34,10 +34,15 @@
 #include <linux/bitops.h>
 #include "lru_cache.h"
 
+#include <linux/slab.h>
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 #include "mempool.h"
 #endif
 
+//#define ALIGN(x,s) (((x) + (s - 1)) & ~(s - 1))
+
+
 // module parameter, defined in drbd_main.c
 extern int minor_count;
 extern int disable_io_hints;