4 files changed, 9 insertions, 6 deletions
diff --git a/sys/compat/ndis/hal_var.h b/sys/compat/ndis/hal_var.h
index d18ae3e..a8be257 100644
--- a/sys/compat/ndis/hal_var.h
+++ b/sys/compat/ndis/hal_var.h
@@ -35,6 +35,14 @@
 #ifndef _HAL_VAR_H_
 #define _HAL_VAR_H_
 
+#ifdef __amd64__
+#define NDIS_BUS_SPACE_IO	AMD64_BUS_SPACE_IO
+#define NDIS_BUS_SPACE_MEM	AMD64_BUS_SPACE_MEM
+#else
+#define NDIS_BUS_SPACE_IO	I386_BUS_SPACE_IO
+#define NDIS_BUS_SPACE_MEM	I386_BUS_SPACE_MEM
+#endif
+
 extern image_patch_table hal_functbl[];
 
 #endif /* _HAL_VAR_H_ */
diff --git a/sys/compat/ndis/pe_var.h b/sys/compat/ndis/pe_var.h
index 06ec2e1..d267a8c 100644
--- a/sys/compat/ndis/pe_var.h
+++ b/sys/compat/ndis/pe_var.h
@@ -418,12 +418,8 @@ typedef struct image_patch_table image_patch_table;
 
 #ifdef __amd64__
 #define	__stdcall
-#define	NDIS_BUS_SPACE_IO	AMD64_BUS_SPACE_IO
-#define	NDIS_BUS_SPACE_MEM	AMD64_BUS_SPACE_MEM
 #else
 #define	__stdcall __attribute__((__stdcall__))
-#define	NDIS_BUS_SPACE_IO	I386_BUS_SPACE_IO
-#define	NDIS_BUS_SPACE_MEM	I386_BUS_SPACE_MEM
 #endif
 
 __BEGIN_DECLS
diff --git a/sys/compat/ndis/subr_ntoskrnl.c b/sys/compat/ndis/subr_ntoskrnl.c
index 923dc1f..a769996 100644
--- a/sys/compat/ndis/subr_ntoskrnl.c
+++ b/sys/compat/ndis/subr_ntoskrnl.c
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 
 #include <compat/ndis/pe_var.h>
+#include <compat/ndis/hal_var.h>
 #include <compat/ndis/resource_var.h>
 #include <compat/ndis/ndis_var.h>
 #include <compat/ndis/ntoskrnl_var.h>
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index a3a9806..e4650e0 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -93,8 +93,6 @@ static struct ndis_type ndis_devs[] = {
 	{ 0, 0, 0, NULL }
 };
 
-#define __stdcall __attribute__((__stdcall__))
-
 static int ndis_probe		(device_t);
 static int ndis_attach		(device_t);
 static int ndis_detach		(device_t);