diff -urpN a/fs/gfs2/locking/dlm/lock_dlm.h b/fs/gfs2/locking/dlm/lock_dlm.h
--- a/fs/gfs2/locking/dlm/lock_dlm.h	2005-09-01 17:44:50.383894040 +0800
+++ b/fs/gfs2/locking/dlm/lock_dlm.h	2005-09-01 17:45:14.183275984 +0800
@@ -25,7 +25,7 @@
 #include <linux/wait.h>
 #include <net/sock.h>
 
-#include "dlm.h"
+#include <linux/dlm.h>
 #include "../harness/lm_interface.h"
 
 /*
diff -urpN a/fs/gfs2/locking/dlm/plock.c b/fs/gfs2/locking/dlm/plock.c
--- a/fs/gfs2/locking/dlm/plock.c	2005-09-01 17:44:50.385893736 +0800
+++ b/fs/gfs2/locking/dlm/plock.c	2005-09-01 17:45:27.192298312 +0800
@@ -7,7 +7,7 @@
  */
 
 #include "lock_dlm.h"
-#include "lock_dlm_plock.h"
+#include <linux/lock_dlm_plock.h>
 
 #include <linux/miscdevice.h>
 
