-#ifdef DLL_EXPORT
-# define XBT_PUBLIC(type) __declspec(dllexport) type
-# define XBT_PUBLIC_NO_IMPORT(type) __declspec(dllexport) type
+/* Build the DLL */
+#if defined(DLL_EXPORT)
+# define XBT_PUBLIC(type) __declspec(dllexport) type
+# define XBT_EXPORT_NO_IMPORT(type) __declspec(dllexport) type
+# define XBT_IMPORT_NO_EXPORT(type) type
+# define XBT_PUBLIC_DATA(type) type __declspec(dllexport)
+
+/* Pack everything up statically */
+#elif defined(DLL_STATIC)
+# define XBT_PUBLIC(type) type
+# define XBT_EXPORT_NO_IMPORT(type) type
+# define XBT_IMPORT_NO_EXPORT(type) type
+# define XBT_PUBLIC_DATA(type) type
+
+/* Link against the DLL */
+#elif (defined(_WIN32) && !defined(DLL_EXPORT))
+# define XBT_PUBLIC(type) __declspec(dllimport) type
+# define XBT_EXPORT_NO_IMPORT(type) type
+# define XBT_IMPORT_NO_EXPORT(type) __declspec(dllimport) type
+# define XBT_PUBLIC_DATA(type) type __declspec(dllimport)
+
+/* Non-UNIX build. Let's keep sain here ;) */