diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
index caa1581e158f44dff31ccd6c6962fea3f975f34d..73c36f501707a5d1dac708ee0cd18a345861c734 100644
--- a/fs/dlm/dlm_internal.h
+++ b/fs/dlm/dlm_internal.h
@@ -43,8 +43,6 @@
 #include <linux/dlm.h>
 #include "config.h"
 
-#define DLM_LOCKSPACE_LEN	64
-
 /* Size of the temp buffer midcomms allocates on the stack.
    We try to make this large enough so most messages fit.
    FIXME: should sctp make this unnecessary? */
diff --git a/include/linux/dlm.h b/include/linux/dlm.h
index c743fbc769dbb19905773828ca69f2f2a89722d7..188f6e6925a0ed8201bccdfd3d4301ceb56639e9 100644
--- a/include/linux/dlm.h
+++ b/include/linux/dlm.h
@@ -22,10 +22,6 @@
 /* Lock levels and flags are here */
 #include <linux/dlmconstants.h>
 
-
-#define DLM_RESNAME_MAXLEN	64
-
-
 typedef void dlm_lockspace_t;
 
 /*
diff --git a/include/linux/dlm_device.h b/include/linux/dlm_device.h
index 9642277a152a2d3d764317d03400a53d2f5eae94..dcfd2499902f62fdea3f0f363a59d5ae7effea70 100644
--- a/include/linux/dlm_device.h
+++ b/include/linux/dlm_device.h
@@ -94,9 +94,6 @@ struct dlm_lock_result {
 #define DLM_USER_PURGE        6
 #define DLM_USER_DEADLOCK     7
 
-/* Arbitrary length restriction */
-#define MAX_LS_NAME_LEN 64
-
 /* Lockspace flags */
 #define DLM_USER_LSFLG_AUTOFREE   1
 #define DLM_USER_LSFLG_FORCEFREE  2
diff --git a/include/linux/dlmconstants.h b/include/linux/dlmconstants.h
index fddb3d3ff321bfd8928f3317ef6f8a50f726f6cf..47bf08dc75665a1a2163ff63145cca89bf900a7e 100644
--- a/include/linux/dlmconstants.h
+++ b/include/linux/dlmconstants.h
@@ -18,6 +18,10 @@
  * Constants used by DLM interface.
  */
 
+#define DLM_LOCKSPACE_LEN       64
+#define DLM_RESNAME_MAXLEN      64
+
+
 /*
  * Lock Modes
  */