diff --git a/iscsi-scst/kernel/isert-scst/iser_rdma.c b/iscsi-scst/kernel/isert-scst/iser_rdma.c
index 94f32942d..2a24a7477 100644
--- a/iscsi-scst/kernel/isert-scst/iser_rdma.c
+++ b/iscsi-scst/kernel/isert-scst/iser_rdma.c
@@ -75,7 +75,7 @@ int isert_post_recv(struct isert_conn *isert_conn,
 		    int num_wr)
 {
 	struct ib_recv_wr *first_ib_wr = &first_wr->recv_wr;
-	BAD_WR_MODIFIER struct ib_recv_wr *bad_wr;
+	struct ib_recv_wr BAD_WR_MODIFIER *bad_wr;
 	int num_posted;
 	int err;
 
diff --git a/iscsi-scst/usr/iscsi_adm.c b/iscsi-scst/usr/iscsi_adm.c
index e9edef9bf..c4d7ca8c9 100644
--- a/iscsi-scst/usr/iscsi_adm.c
+++ b/iscsi-scst/usr/iscsi_adm.c
@@ -48,7 +48,7 @@ enum iscsi_adm_op {
 
 static const char program_name[] = "iscsi-scst-adm";
 
-static struct option const long_options[] = {
+static const struct option long_options[] = {
 	{"op", required_argument, NULL, 'o'},
 	{"tid", required_argument, NULL, 't'},
 	{"sid", required_argument, NULL, 's'},
diff --git a/iscsi-scst/usr/iscsi_scstd.c b/iscsi-scst/usr/iscsi_scstd.c
index 201d869ad..62f1ccd09 100644
--- a/iscsi-scst/usr/iscsi_scstd.c
+++ b/iscsi-scst/usr/iscsi_scstd.c
@@ -54,7 +54,7 @@ struct iscsi_init_params iscsi_init_params;
 
 static const char program_name[] = "iscsi-scstd";
 
-static struct option const long_options[] = {
+static const struct option long_options[] = {
 	{"config", required_argument, 0, 'c'},
 	{"foreground", no_argument, 0, 'f'},
 	{"debug", required_argument, 0, 'd'},
diff --git a/scst/src/dev_handlers/scst_user_main.c b/scst/src/dev_handlers/scst_user_main.c
index dbfc3cc9f..304ec2733 100644
--- a/scst/src/dev_handlers/scst_user_main.c
+++ b/scst/src/dev_handlers/scst_user_main.c
@@ -768,7 +768,7 @@ static void dev_user_flush_dcache(struct scst_user_cmd *ucmd)
 	 */
 
 	for (i = 0; (bufflen > 0) && (i < buf_ucmd->num_data_pages); i++) {
-		struct page *page __attribute__((unused));
+		struct page *page __maybe_unused;
 
 		page = buf_ucmd->data_pages[i];
 #ifdef ARCH_HAS_FLUSH_ANON_PAGE
diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c
index f4a6d9f7c..56c980d2a 100644
--- a/srpt/src/ib_srpt.c
+++ b/srpt/src/ib_srpt.c
@@ -943,7 +943,7 @@ static int srpt_post_recv(struct srpt_device *sdev, struct srpt_rdma_ch *ch,
 {
 	struct ib_sge list;
 	struct ib_recv_wr wr;
-	BAD_WR_MODIFIER struct ib_recv_wr *bad_wr;
+	struct ib_recv_wr BAD_WR_MODIFIER *bad_wr;
 
 	BUG_ON(!sdev);
 	wr.wr_id = encode_wr_id(SRPT_RECV, ioctx->ioctx.index);
diff --git a/usr/events/events.c b/usr/events/events.c
index 7f99fc973..090236677 100644
--- a/usr/events/events.c
+++ b/usr/events/events.c
@@ -56,7 +56,7 @@ bool log_daemon; /* needed for the tracing infrastructure */
 unsigned long trace_flag = DEFAULT_LOG_FLAGS;
 #endif /* defined(DEBUG) || defined(TRACING) */
 
-static struct option const long_options[] = {
+static const struct option long_options[] = {
 	{"allowed_event", required_argument, 0, 'e'},
 	{"allowed_issuer", required_argument, 0, 'i'},
 	{"non_blocking", no_argument, 0, 'n'},
diff --git a/usr/fileio/fileio.c b/usr/fileio/fileio.c
index 0662f22bf..254789f97 100644
--- a/usr/fileio/fileio.c
+++ b/usr/fileio/fileio.c
@@ -102,7 +102,7 @@ bool use_multi = true;
 
 static void *(*alloc_fn)(size_t size) = align_alloc;
 
-static struct option const long_options[] =
+static const struct option long_options[] =
 {
 	{"block", required_argument, 0, 'b'},
 	{"threads", required_argument, 0, 'e'},
diff --git a/usr/stpgd/stpgd_main.c b/usr/stpgd/stpgd_main.c
index ec4ef96ce..30538997f 100644
--- a/usr/stpgd/stpgd_main.c
+++ b/usr/stpgd/stpgd_main.c
@@ -56,7 +56,7 @@ unsigned long trace_flag = DEFAULT_LOG_FLAGS;
 bool log_daemon = true;
 int transition_timeout = DEFAULT_TRANSITION_TIME;
 
-static struct option const long_options[] = {
+static const struct option long_options[] = {
 	{"path", required_argument, 0, 'p'},
 	{"timeout", required_argument, 0, 't'},
 	{"foreground", no_argument, 0, 'f'},