diff --git a/iscsi-scst/kernel/conn.c b/iscsi-scst/kernel/conn.c
index fff43f035..eaf9bc9ea 100644
--- a/iscsi-scst/kernel/conn.c
+++ b/iscsi-scst/kernel/conn.c
@@ -23,9 +23,9 @@
 #include "digest.h"
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-#ifdef CONFIG_LOCKDEP
+#if defined(CONFIG_LOCKDEP) && !defined(CONFIG_SCST_PROC)
 static struct lock_class_key scst_conn_key;
-struct lockdep_map scst_conn_dep_map =
+static struct lockdep_map scst_conn_dep_map =
 	STATIC_LOCKDEP_MAP_INIT("iscsi_conn_kref", &scst_conn_key);
 #endif
 #endif
diff --git a/scst/src/scst_mem.c b/scst/src/scst_mem.c
index b14759735..85a28fbca 100644
--- a/scst/src/scst_mem.c
+++ b/scst/src/scst_mem.c
@@ -42,9 +42,9 @@
 #define MAX_PAGES_PER_POOL	50
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
-#ifdef CONFIG_LOCKDEP
+#if defined(CONFIG_LOCKDEP) && !defined(CONFIG_SCST_PROC)
 static struct lock_class_key scst_pool_key;
-struct lockdep_map scst_pool_dep_map =
+static struct lockdep_map scst_pool_dep_map =
 	STATIC_LOCKDEP_MAP_INIT("scst_pool_kref", &scst_pool_key);
 #endif
 #endif