diff --git a/common/xash3d_types.h b/common/xash3d_types.h
index 181e7afa..214c97c7 100644
--- a/common/xash3d_types.h
+++ b/common/xash3d_types.h
@@ -68,9 +68,19 @@ typedef integer64 longtime_t;
 #define IsColorString( p )	( p && *( p ) == '^' && *(( p ) + 1) && *(( p ) + 1) >= '0' && *(( p ) + 1 ) <= '9' )
 #define ColorIndex( c )	((( c ) - '0' ) & 7 )
 
-#if defined __i386__ &&  defined __GNUC__
-#define GAME_EXPORT __attribute__((force_align_arg_pointer))
+#if defined(__GNUC__)
+#ifdef __i386__
+#define EXPORT __attribute__ ((visibility ("default"),force_align_arg_pointer))
+#define GAME_EXPORT __attribute((force_align_arg_pointer))
 #else
+#define EXPORT __attribute__ ((visibility ("default")))
+#define GAME_EXPORT
+#endif
+#elif defined(_MSC_VER)
+#define EXPORT          __declspec( dllexport )
+#define GAME_EXPORT
+#else
+#define EXPORT
 #define GAME_EXPORT
 #endif
 
diff --git a/engine/common/common.h b/engine/common/common.h
index 6b493c91..44fddb84 100644
--- a/engine/common/common.h
+++ b/engine/common/common.h
@@ -47,16 +47,8 @@ XASH SPECIFIC			- sort of hack that works only in Xash3D not in GoldSrc
 
 #ifndef _WIN32
 #include <stddef.h> // size_t
-
-#ifdef __i386__
-#define EXPORT __attribute__ ((visibility ("default"),force_align_arg_pointer))
-#else
-#define EXPORT __attribute__ ((visibility ("default")))
-#endif
 #else
 #include <sys/types.h> // off_t
-
-#define EXPORT		__declspec( dllexport )
 #endif
 
 // configuration