diff --git a/include/slist.h b/include/slist.h
index 0f287c6..80384a4 100644
--- a/include/slist.h
+++ b/include/slist.h
@@ -18,15 +18,15 @@
 #ifndef __iscsi_slist_h__
 #define __iscsi_slist_h__
 
-#define SLIST_ADD(list, item) \
+#define ISCSI_LIST_ADD(list, item) \
 	do {							\
 		(item)->next = (*list);				\
 		(*list) = (item);				\
 	} while (0);
 
-#define SLIST_ADD_END(list, item)				\
+#define ISCSI_LIST_ADD_END(list, item)	\
 	if ((*list) == NULL) {	 				\
-	   SLIST_ADD((list), (item));				\
+	   ISCSI_LIST_ADD((list), (item));				\
 	} else {						\
 	   void *head = (*list);				\
 	   while ((*list)->next)				\
@@ -36,7 +36,7 @@
 	   (*list) = head;					\
 	}
 
-#define SLIST_REMOVE(list, item) \
+#define ISCSI_LIST_REMOVE(list, item) \
 	if ((*list) == (item)) { 				\
 	   (*list) = (item)->next;				\
 	} else {						\
@@ -49,7 +49,7 @@
 	   (*list) = head;					\
 	}
 
-#define SLIST_LENGTH(list,length) \
+#define ISCSI_LIST_LENGTH(list,length) \
 	do { \
 	    (length) = 0; \
 		void *head = (*list); \
diff --git a/lib/connect.c b/lib/connect.c
index f9e9c42..94835fa 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -204,7 +204,7 @@ void iscsi_defer_reconnect(struct iscsi_context *iscsi)
 	ISCSI_LOG(iscsi, 2, "reconnect deferred, cancelling all tasks");
 
 	while ((pdu = iscsi->outqueue)) {
-		SLIST_REMOVE(&iscsi->outqueue, pdu);
+		ISCSI_LIST_REMOVE(&iscsi->outqueue, pdu);
 		if ( !(pdu->flags & ISCSI_PDU_NO_CALLBACK)) {
 			/* If an error happened during connect/login,
 			   we don't want to call any of the callbacks.
@@ -217,7 +217,7 @@ void iscsi_defer_reconnect(struct iscsi_context *iscsi)
 		iscsi_free_pdu(iscsi, pdu);
 	}
 	while ((pdu = iscsi->waitpdu)) {
-		SLIST_REMOVE(&iscsi->waitpdu, pdu);
+		ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
 		/* If an error happened during connect/login,
 		   we don't want to call any of the callbacks.
 		 */
@@ -316,14 +316,14 @@ try_again:
 
 	while (old_iscsi->outqueue) {
 		struct iscsi_pdu *pdu = old_iscsi->outqueue;
-		SLIST_REMOVE(&old_iscsi->outqueue, pdu);
-		SLIST_ADD_END(&old_iscsi->waitpdu, pdu);
+		ISCSI_LIST_REMOVE(&old_iscsi->outqueue, pdu);
+		ISCSI_LIST_ADD_END(&old_iscsi->waitpdu, pdu);
 	}
 
 	while (old_iscsi->waitpdu) {
 		struct iscsi_pdu *pdu = old_iscsi->waitpdu;
 
-		SLIST_REMOVE(&old_iscsi->waitpdu, pdu);
+		ISCSI_LIST_REMOVE(&old_iscsi->waitpdu, pdu);
 		if (pdu->itt == 0xffffffff) {
 			continue;
 		}
diff --git a/lib/init.c b/lib/init.c
index 99437f2..375a51b 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -294,7 +294,7 @@ iscsi_destroy_context(struct iscsi_context *iscsi)
 	}
 
 	while ((pdu = iscsi->outqueue)) {
-		SLIST_REMOVE(&iscsi->outqueue, pdu);
+		ISCSI_LIST_REMOVE(&iscsi->outqueue, pdu);
 		if ( !(pdu->flags & ISCSI_PDU_NO_CALLBACK)) {
 			/* If an error happened during connect/login, we don't want to
 			   call any of the callbacks.
@@ -307,7 +307,7 @@ iscsi_destroy_context(struct iscsi_context *iscsi)
 		iscsi_free_pdu(iscsi, pdu);
 	}
 	while ((pdu = iscsi->waitpdu)) {
-		SLIST_REMOVE(&iscsi->waitpdu, pdu);
+		ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
 		/* If an error happened during connect/login, we don't want to
 		   call any of the callbacks.
 		 */
diff --git a/lib/iscsi-command.c b/lib/iscsi-command.c
index 0e24363..95187a1 100644
--- a/lib/iscsi-command.c
+++ b/lib/iscsi-command.c
@@ -87,8 +87,8 @@ iscsi_send_data_out(struct iscsi_context *iscsi, struct iscsi_pdu *cmd_pdu,
 		if (pdu == NULL) {
 			iscsi_set_error(iscsi, "Out-of-memory, Failed to allocate "
 				"scsi data out pdu.");
-			SLIST_REMOVE(&iscsi->outqueue, cmd_pdu);
-			SLIST_REMOVE(&iscsi->waitpdu, cmd_pdu);
+			ISCSI_LIST_REMOVE(&iscsi->outqueue, cmd_pdu);
+			ISCSI_LIST_REMOVE(&iscsi->waitpdu, cmd_pdu);
 			cmd_pdu->callback(iscsi, SCSI_STATUS_ERROR, NULL,
 				     cmd_pdu->private_data);
 			iscsi_free_pdu(iscsi, cmd_pdu);
@@ -137,8 +137,8 @@ iscsi_send_data_out(struct iscsi_context *iscsi, struct iscsi_pdu *cmd_pdu,
 		if (iscsi_queue_pdu(iscsi, pdu) != 0) {
 			iscsi_set_error(iscsi, "Out-of-memory: failed to queue iscsi "
 				"scsi pdu.");
-			SLIST_REMOVE(&iscsi->outqueue, cmd_pdu);
-			SLIST_REMOVE(&iscsi->waitpdu, cmd_pdu);
+			ISCSI_LIST_REMOVE(&iscsi->outqueue, cmd_pdu);
+			ISCSI_LIST_REMOVE(&iscsi->waitpdu, cmd_pdu);
 			cmd_pdu->callback(iscsi, SCSI_STATUS_ERROR, NULL,
 				     cmd_pdu->private_data);
 			iscsi_free_pdu(iscsi, cmd_pdu);
@@ -180,7 +180,7 @@ iscsi_timeout_scan(struct iscsi_context *iscsi)
 		scsi_cbdata = &pdu->scsi_cbdata;
 		task = scsi_cbdata->task;
 
-		SLIST_REMOVE(&iscsi->waitpdu, pdu);
+		ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
 		pdu->callback(iscsi, SCSI_STATUS_TIMEOUT,
 				task, pdu->private_data);
 		iscsi_set_error(iscsi, "SCSI command timed out");
@@ -1883,7 +1883,7 @@ iscsi_scsi_cancel_task(struct iscsi_context *iscsi,
 
 	for (pdu = iscsi->waitpdu; pdu; pdu = pdu->next) {
 		if (pdu->itt == task->itt) {
-			SLIST_REMOVE(&iscsi->waitpdu, pdu);
+			ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
 			if ( !(pdu->flags & ISCSI_PDU_NO_CALLBACK)) {
 				pdu->callback(iscsi, SCSI_STATUS_CANCELLED, NULL,
 				      pdu->private_data);
@@ -1894,7 +1894,7 @@ iscsi_scsi_cancel_task(struct iscsi_context *iscsi,
 	}
 	for (pdu = iscsi->outqueue; pdu; pdu = pdu->next) {
 		if (pdu->itt == task->itt) {
-			SLIST_REMOVE(&iscsi->outqueue, pdu);
+			ISCSI_LIST_REMOVE(&iscsi->outqueue, pdu);
 			if ( !(pdu->flags & ISCSI_PDU_NO_CALLBACK)) {
 				pdu->callback(iscsi, SCSI_STATUS_CANCELLED, NULL,
 				      pdu->private_data);
@@ -1912,7 +1912,7 @@ iscsi_scsi_cancel_all_tasks(struct iscsi_context *iscsi)
 	struct iscsi_pdu *pdu;
 
 	while ((pdu = iscsi->waitpdu)) {
-		SLIST_REMOVE(&iscsi->waitpdu, pdu);
+		ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
 		if ( !(pdu->flags & ISCSI_PDU_NO_CALLBACK)) {
 			pdu->callback(iscsi, SCSI_STATUS_CANCELLED, NULL,
 				      pdu->private_data);
@@ -1920,7 +1920,7 @@ iscsi_scsi_cancel_all_tasks(struct iscsi_context *iscsi)
 		iscsi_free_pdu(iscsi, pdu);
 	}
 	while ((pdu = iscsi->outqueue)) {
-		SLIST_REMOVE(&iscsi->outqueue, pdu);
+		ISCSI_LIST_REMOVE(&iscsi->outqueue, pdu);
 		if ( !(pdu->flags & ISCSI_PDU_NO_CALLBACK)) {
 			pdu->callback(iscsi, SCSI_STATUS_CANCELLED, NULL,
 				      pdu->private_data);
diff --git a/lib/pdu.c b/lib/pdu.c
index 99730a3..89b15c2 100644
--- a/lib/pdu.c
+++ b/lib/pdu.c
@@ -353,7 +353,7 @@ int iscsi_process_reject(struct iscsi_context *iscsi,
 	pdu->callback(iscsi, SCSI_STATUS_ERROR, NULL,
 			      pdu->private_data);
 
-	SLIST_REMOVE(&iscsi->waitpdu, pdu);
+	ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
 	iscsi_free_pdu(iscsi, pdu);
 	return 0;
 }
@@ -426,7 +426,7 @@ iscsi_process_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in)
 		switch (opcode) {
 		case ISCSI_PDU_LOGIN_RESPONSE:
 			if (iscsi_process_login_reply(iscsi, pdu, in) != 0) {
-				SLIST_REMOVE(&iscsi->waitpdu, pdu);
+				ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
 				iscsi_free_pdu(iscsi, pdu);
 				iscsi_set_error(iscsi, "iscsi login reply "
 						"failed");
@@ -435,7 +435,7 @@ iscsi_process_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in)
 			break;
 		case ISCSI_PDU_TEXT_RESPONSE:
 			if (iscsi_process_text_reply(iscsi, pdu, in) != 0) {
-				SLIST_REMOVE(&iscsi->waitpdu, pdu);
+				ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
 				iscsi_free_pdu(iscsi, pdu);
 				iscsi_set_error(iscsi, "iscsi text reply "
 						"failed");
@@ -444,7 +444,7 @@ iscsi_process_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in)
 			break;
 		case ISCSI_PDU_LOGOUT_RESPONSE:
 			if (iscsi_process_logout_reply(iscsi, pdu, in) != 0) {
-				SLIST_REMOVE(&iscsi->waitpdu, pdu);
+				ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
 				iscsi_free_pdu(iscsi, pdu);
 				iscsi_set_error(iscsi, "iscsi logout reply "
 						"failed");
@@ -453,7 +453,7 @@ iscsi_process_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in)
 			break;
 		case ISCSI_PDU_SCSI_RESPONSE:
 			if (iscsi_process_scsi_reply(iscsi, pdu, in) != 0) {
-				SLIST_REMOVE(&iscsi->waitpdu, pdu);
+				ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
 				iscsi_free_pdu(iscsi, pdu);
 				iscsi_set_error(iscsi, "iscsi response reply "
 						"failed");
@@ -463,7 +463,7 @@ iscsi_process_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in)
 		case ISCSI_PDU_DATA_IN:
 			if (iscsi_process_scsi_data_in(iscsi, pdu, in,
 						       &is_finished) != 0) {
-				SLIST_REMOVE(&iscsi->waitpdu, pdu);
+				ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
 				iscsi_free_pdu(iscsi, pdu);
 				iscsi_set_error(iscsi, "iscsi data in "
 						"failed");
@@ -472,7 +472,7 @@ iscsi_process_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in)
 			break;
 		case ISCSI_PDU_NOP_IN:
 			if (iscsi_process_nop_out_reply(iscsi, pdu, in) != 0) {
-				SLIST_REMOVE(&iscsi->waitpdu, pdu);
+				ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
 				iscsi_free_pdu(iscsi, pdu);
 				iscsi_set_error(iscsi, "iscsi nop-in failed");
 				return -1;
@@ -481,7 +481,7 @@ iscsi_process_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in)
 		case ISCSI_PDU_SCSI_TASK_MANAGEMENT_RESPONSE:
 			if (iscsi_process_task_mgmt_reply(iscsi, pdu,
 							  in) != 0) {
-				SLIST_REMOVE(&iscsi->waitpdu, pdu);
+				ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
 				iscsi_free_pdu(iscsi, pdu);
 				iscsi_set_error(iscsi, "iscsi task-mgmt failed");
 				return -1;
@@ -489,7 +489,7 @@ iscsi_process_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in)
 			break;
 		case ISCSI_PDU_R2T:
 			if (iscsi_process_r2t(iscsi, pdu, in) != 0) {
-				SLIST_REMOVE(&iscsi->waitpdu, pdu);
+				ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
 				iscsi_free_pdu(iscsi, pdu);
 				iscsi_set_error(iscsi, "iscsi r2t "
 						"failed");
@@ -504,7 +504,7 @@ iscsi_process_pdu(struct iscsi_context *iscsi, struct iscsi_in_pdu *in)
 		}
 
 		if (is_finished) {
-			SLIST_REMOVE(&iscsi->waitpdu, pdu);
+			ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
 			iscsi_free_pdu(iscsi, pdu);
 		}
 		return 0;
diff --git a/lib/scsi-lowlevel.c b/lib/scsi-lowlevel.c
index bd1ebfe..a60ae73 100644
--- a/lib/scsi-lowlevel.c
+++ b/lib/scsi-lowlevel.c
@@ -70,7 +70,7 @@ scsi_free_scsi_task(struct scsi_task *task)
 		return;
 
 	while ((mem = task->mem)) {
-		   SLIST_REMOVE(&task->mem, mem);
+		   ISCSI_LIST_REMOVE(&task->mem, mem);
 		   free(mem);
 	}
 
@@ -108,7 +108,7 @@ scsi_malloc(struct scsi_task *task, size_t size)
 		return NULL;
 	}
 	memset(mem, 0, sizeof(struct scsi_allocated_memory) + size);
-	SLIST_ADD(&task->mem, mem);
+	ISCSI_LIST_ADD(&task->mem, mem);
 	return &mem->buf[0];
 }
 
diff --git a/lib/socket.c b/lib/socket.c
index e48ae36..4b1c569 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -578,7 +578,7 @@ iscsi_read_from_socket(struct iscsi_context *iscsi)
 		return 0;
 	}
 
-	SLIST_ADD_END(&iscsi->inqueue, in);
+	ISCSI_LIST_ADD_END(&iscsi->inqueue, in);
 	iscsi->incoming = NULL;
 
 
@@ -588,7 +588,7 @@ iscsi_read_from_socket(struct iscsi_context *iscsi)
 		if (iscsi_process_pdu(iscsi, current) != 0) {
 			return -1;
 		}
-		SLIST_REMOVE(&iscsi->inqueue, current);
+		ISCSI_LIST_REMOVE(&iscsi->inqueue, current);
 		iscsi_free_iscsi_in_pdu(iscsi, current);
 	}
 
@@ -617,13 +617,13 @@ iscsi_write_to_socket(struct iscsi_context *iscsi)
 			}
 			/* pop first element of the outqueue */
 			iscsi->outqueue_current = iscsi->outqueue;
-			SLIST_REMOVE(&iscsi->outqueue, iscsi->outqueue_current);
+			ISCSI_LIST_REMOVE(&iscsi->outqueue, iscsi->outqueue_current);
 			if (!(iscsi->outqueue_current->flags & ISCSI_PDU_DELETE_WHEN_SENT)) {
 				/* we have to add the pdu to the waitqueue already here
 				   since the storage might sent a R2T as soon as it has
 				   received the header. if we sent immediate data in a
 				   cmd PDU the R2T might get lost otherwise. */
-				SLIST_ADD_END(&iscsi->waitpdu, iscsi->outqueue_current);
+				ISCSI_LIST_ADD_END(&iscsi->waitpdu, iscsi->outqueue_current);
 			}
 		}
 
diff --git a/test-tool/iscsi-support.c b/test-tool/iscsi-support.c
index 35b6c91..26d04b6 100644
--- a/test-tool/iscsi-support.c
+++ b/test-tool/iscsi-support.c
@@ -163,10 +163,10 @@ wait_until_test_finished(struct iscsi_context *iscsi, struct iscsi_async_state *
 				state->task->status = SCSI_STATUS_CANCELLED;
 				/* this may leak memory since we don't free the pdu */
 				while ((pdu = iscsi->outqueue)) {
-					SLIST_REMOVE(&iscsi->outqueue, pdu);
+					ISCSI_LIST_REMOVE(&iscsi->outqueue, pdu);
 				}
 				while ((pdu = iscsi->waitpdu)) {
-					SLIST_REMOVE(&iscsi->waitpdu, pdu);
+					ISCSI_LIST_REMOVE(&iscsi->waitpdu, pdu);
 				}
 				return;
 			}