diff --git a/scst/src/dev_handlers/scst_changer.c b/scst/src/dev_handlers/scst_changer.c
index 49d85e70c..84e2bbaa2 100644
--- a/scst/src/dev_handlers/scst_changer.c
+++ b/scst/src/dev_handlers/scst_changer.c
@@ -57,7 +57,7 @@ static struct scst_dev_type changer_devtype = CHANGER_TYPE;
  *
  *  Description:
  *************************************************************/
-int changer_attach(struct scst_device *dev)
+static int changer_attach(struct scst_device *dev)
 {
 	int res = 0;
 	int retries;
@@ -142,7 +142,7 @@ void changer_detach(struct scst_device *dev)
  *
  *  Note:  Not all states are allowed on return
  ********************************************************************/
-int changer_parse(struct scst_cmd *cmd)
+static int changer_parse(struct scst_cmd *cmd)
 {
 	int res = SCST_CMD_STATE_DEFAULT;
 
diff --git a/scst/src/dev_handlers/scst_processor.c b/scst/src/dev_handlers/scst_processor.c
index 7b24e9c04..ba70d3331 100644
--- a/scst/src/dev_handlers/scst_processor.c
+++ b/scst/src/dev_handlers/scst_processor.c
@@ -57,7 +57,7 @@ static struct scst_dev_type processor_devtype = PROCESSOR_TYPE;
  *
  *  Description:
  *************************************************************/
-int processor_attach(struct scst_device *dev)
+static int processor_attach(struct scst_device *dev)
 {
 	int res = 0;
 	int retries;
@@ -142,7 +142,7 @@ void processor_detach(struct scst_device *dev)
  *
  *  Note:  Not all states are allowed on return
  ********************************************************************/
-int processor_parse(struct scst_cmd *cmd)
+static int processor_parse(struct scst_cmd *cmd)
 {
 	int res = SCST_CMD_STATE_DEFAULT;
 
diff --git a/scst/src/dev_handlers/scst_raid.c b/scst/src/dev_handlers/scst_raid.c
index 38a38cb82..020e28a27 100644
--- a/scst/src/dev_handlers/scst_raid.c
+++ b/scst/src/dev_handlers/scst_raid.c
@@ -57,7 +57,7 @@ static struct scst_dev_type raid_devtype = RAID_TYPE;
  *
  *  Description:
  *************************************************************/
-int raid_attach(struct scst_device *dev)
+static int raid_attach(struct scst_device *dev)
 {
 	int res = 0;
 	int retries;
diff --git a/scst/src/dev_handlers/scst_user.c b/scst/src/dev_handlers/scst_user.c
index ce51be0de..e1c9daacf 100644
--- a/scst/src/dev_handlers/scst_user.c
+++ b/scst/src/dev_handlers/scst_user.c
@@ -2817,12 +2817,12 @@ static int dev_user_process_cleanup(struct scst_user_dev *dev)
 	int i;
 	for (i = 0; i < (int)ARRAY_SIZE(dev->ucmd_hash); i++) {
 		struct list_head *head = &dev->ucmd_hash[i];
-		struct scst_user_cmd *ucmd;
+		struct scst_user_cmd *ucmd2;
 again:
-		list_for_each_entry(ucmd, head, hash_list_entry) {
-			PRINT_ERROR("Lost ucmd %p (state %x, ref %d)", ucmd,
-				ucmd->state, atomic_read(&ucmd->ucmd_ref));
-			ucmd_put(ucmd);
+		list_for_each_entry(ucmd2, head, hash_list_entry) {
+			PRINT_ERROR("Lost ucmd %p (state %x, ref %d)", ucmd2,
+				ucmd2->state, atomic_read(&ucmd2->ucmd_ref));
+			ucmd_put(ucmd2);
 			goto again;
 		}
 	}
diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index 51806bee2..ebd31f66f 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -2202,7 +2202,8 @@ restart:
 		PRINT_ERROR("lseek trouble %lld != %lld",
 			    (long long unsigned int)err,
 			    (long long unsigned int)loff);
-		scst_set_cmd_error(cmd, SCST_LOAD_SENSE(scst_sense_hardw_error));
+		scst_set_cmd_error(cmd,
+				   SCST_LOAD_SENSE(scst_sense_hardw_error));
 		goto out_set_fs;
 	}