diff --git a/hw/xfree86/os-support/drm/xf86drm.c b/hw/xfree86/os-support/drm/xf86drm.c
index e79794b3f..1082f225a 100644
--- a/hw/xfree86/os-support/drm/xf86drm.c
+++ b/hw/xfree86/os-support/drm/xf86drm.c
@@ -63,9 +63,8 @@
 #  define _DRM_MALLOC malloc
 #  define _DRM_FREE   free
 # else
-#  include <X11/Xlibint.h>
-#  define _DRM_MALLOC Xmalloc
-#  define _DRM_FREE   Xfree
+#  define _DRM_MALLOC malloc
+#  define _DRM_FREE   free
 # endif
 # include "drm.h"
 #endif
diff --git a/hw/xfree86/os-support/xf86drm.h b/hw/xfree86/os-support/xf86drm.h
index d2ca95791..30496d0d4 100644
--- a/hw/xfree86/os-support/xf86drm.h
+++ b/hw/xfree86/os-support/xf86drm.h
@@ -319,8 +319,8 @@ typedef struct _drmSetVersion {
                 "       stl_c %1, %2\n"		\
                 "1:     xor   %1, 1, %1\n"	\
                 "       stl   %1, %3"		\
-                : "+r" (old32),                 \
-		  "+&r" (cur32),		\
+                : "=r" (old32),                 \
+		  "=&r" (cur32),		\
                    "=m" (__drm_dummy_lock(lock)),\
                    "=m" (ret)			\
  		: "r" (old),			\