diff --git a/Makefile.am b/Makefile.am
index b7e1120..c57b2db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,8 +12,7 @@ endif
 
 ACLOCAL_AMFLAGS =-I m4
 AUTOMAKE_OPTIONS = foreign subdir-objects
-AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))" \
-	"-D_R_(A,B)=__attribute__((format(printf,A,B)))"
+AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))"
 AM_CFLAGS=$(WARN_CFLAGS)
 
 EXTRA_DIST = autogen.sh COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt \
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 4807178..28e5af1 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS=-I. -I${srcdir}/../include "-D_U_=__attribute__((unused))" \
-	"-D_R_(A,B)=__attribute__((format(printf,A,B)))"
+AM_CPPFLAGS=-I. -I${srcdir}/../include "-D_U_=__attribute__((unused))"
 AM_CFLAGS=$(WARN_CFLAGS)
 AM_LDFLAGS=-no-undefined
 LIBS=../lib/libiscsi.la
diff --git a/include/iscsi-private.h b/include/iscsi-private.h
index f93b801..e03dd0c 100644
--- a/include/iscsi-private.h
+++ b/include/iscsi-private.h
@@ -330,13 +330,8 @@ int iscsi_process_reject(struct iscsi_context *iscsi,
 				struct iscsi_in_pdu *in);
 int iscsi_send_target_nop_out(struct iscsi_context *iscsi, uint32_t ttt, uint32_t lun);
 
-#if defined(_WIN32)
-void iscsi_set_error(struct iscsi_context *iscsi, const char *error_string,
-		     ...);
-#else
 void iscsi_set_error(struct iscsi_context *iscsi, const char *error_string,
 		     ...) __attribute__((format(printf, 2, 3)));
-#endif
 
 struct scsi_iovector *iscsi_get_scsi_task_iovector_in(struct iscsi_context *iscsi, struct iscsi_in_pdu *in);
 struct scsi_iovector *iscsi_get_scsi_task_iovector_out(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e6f82c8..90b508e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -23,8 +23,7 @@ endif
 libiscsipriv_la_LDFLAGS = -no-undefined
 
 libiscsipriv_la_CPPFLAGS = -I${srcdir}/../include -I$(srcdir)/include \
-	"-D_U_=__attribute__((unused))" \
-	"-D_R_(A,B)=__attribute__((format(printf,A,B)))"
+	"-D_U_=__attribute__((unused))"
 
 AM_CFLAGS=$(WARN_CFLAGS)
 
diff --git a/test-tool/Makefile.am b/test-tool/Makefile.am
index f40787a..6f75666 100644
--- a/test-tool/Makefile.am
+++ b/test-tool/Makefile.am
@@ -1,6 +1,5 @@
 AM_CPPFLAGS=-I. -I${srcdir}/../include \
-	"-D_U_=__attribute__((unused)) " \
-	"-D_R_(A,B)=__attribute__((format(printf,A,B)))"
+	"-D_U_=__attribute__((unused)) "
 AM_CFLAGS=$(WARN_CFLAGS)
 AM_LDFLAGS=-no-undefined
 LIBS = ../lib/libiscsipriv.la
diff --git a/test-tool/iscsi-support.h b/test-tool/iscsi-support.h
index 78a20cc..30726cb 100644
--- a/test-tool/iscsi-support.h
+++ b/test-tool/iscsi-support.h
@@ -65,7 +65,8 @@ extern int loglevel;
 #define LOG_SILENT  0
 #define LOG_NORMAL  1
 #define LOG_VERBOSE 2
-void logging(int level, const char *format, ...) _R_(2,3);
+void logging(int level, const char *format, ...)
+__attribute__((format(printf, 2, 3)));
 
 /*
  * define special flags for logging a blank line, so compiler
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 06bf504..6423e85 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \
-	"-D_R_(A,B)=__attribute__((format(printf,A,B)))"
+AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))"
 AM_CFLAGS = $(WARN_CFLAGS)
 AM_LDFLAGS = -no-undefined
 LIBS = ../lib/libiscsi.la
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 7aab327..a8c053a 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \
-	"-D_R_(A,B)=__attribute__((format(printf,A,B)))"
+AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))"
 AM_CFLAGS = $(WARN_CFLAGS)
 AM_LDFLAGS = -no-undefined
 LIBS = ../lib/libiscsi.la
diff --git a/win32/win32_compat.h b/win32/win32_compat.h
index f30269a..5f9a841 100644
--- a/win32/win32_compat.h
+++ b/win32/win32_compat.h
@@ -36,6 +36,10 @@ THE SOFTWARE.
 #include <malloc.h>
 #include <sys/stat.h>
 
+#if defined(_MSC_VER)
+#define __attribute__(attr)
+#endif
+
 #define SOL_TCP IPPROTO_TCP
 
 #if(_WIN32_WINNT < 0x0600)