diff --git a/amd64/bsd_asm.h b/amd64/bsd_asm.h
index ea4580c..c9736ff 100644
--- a/amd64/bsd_asm.h
+++ b/amd64/bsd_asm.h
@@ -68,11 +68,16 @@
 #define	END(x)		.size x, . - x
 
 #elif defined(_WIN32)
-#define _ENTRY(x)	_START_ENTRY; \
+#ifndef _MSC_VER
+#define END(x) .end
+#define _START_ENTRY_WIN .text; _START_ENTRY
+#else
+#define END(x) end
+#define _START_ENTRY_WIN .model small; .code; _START_ENTRY
+#endif
+#define _ENTRY(x)	_START_ENTRY_WIN; \
             .globl CNAME(x); .section .drectve; .ascii " -export:" #x; \
             .section .text; .def CNAME(x); .scl 2; .type 32; .endef; CNAME(x):
-#define END(x) .end
-
 #endif
 
 #ifdef PROF
diff --git a/i387/bsd_asm.h b/i387/bsd_asm.h
index 29ef51f..fb79308 100644
--- a/i387/bsd_asm.h
+++ b/i387/bsd_asm.h
@@ -81,11 +81,9 @@
 #elif defined(_WIN32)
 #ifndef _MSC_VER
 #define END(x) .end
-#define HEX(Y) 0x#Y
 #define _START_ENTRY_WIN .text; _START_ENTRY
 #else
 #define END(x) end
-#define HEX(Y) Y#h
 #define _START_ENTRY_WIN .model small; .code; _START_ENTRY
 #endif
 #define CNAME(csym)		_##csym