diff --git a/driver/xf86-video-nv/src/nv_driver.c b/driver/xf86-video-nv/src/nv_driver.c
index 2a4160efc..dc8bfdab1 100644
--- a/driver/xf86-video-nv/src/nv_driver.c
+++ b/driver/xf86-video-nv/src/nv_driver.c
@@ -2631,11 +2631,13 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
                case 16:	refreshArea = NVRefreshArea16;	break;
                case 32:	refreshArea = NVRefreshArea32;	break;
 	   }
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,19,99,1,0)
            if(!pNv->RandRRotation) {
                xf86DisableRandR();
                xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                           "Driver rotation enabled, RandR disabled\n");
            }
+#endif
 	}
         pNv->refreshArea = refreshArea;
 	NVShadowInit(pScreen);
diff --git a/driver/xf86-video-nv/src/riva_driver.c b/driver/xf86-video-nv/src/riva_driver.c
index 759501e13..d816e9cb8 100644
--- a/driver/xf86-video-nv/src/riva_driver.c
+++ b/driver/xf86-video-nv/src/riva_driver.c
@@ -1210,9 +1210,11 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
                case 16:	refreshArea = RivaRefreshArea16;	break;
                case 32:	refreshArea = RivaRefreshArea32;	break;
 	   }
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,19,99,1,0)
            xf86DisableRandR();
            xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                       "Driver rotation enabled, RandR disabled\n");
+#endif
 	}
 
 	ShadowFBInit(pScreen, refreshArea);
diff --git a/driver/xf86-video-nv/src/riva_include.h b/driver/xf86-video-nv/src/riva_include.h
index c7aeef7b5..664ff9fd7 100644
--- a/driver/xf86-video-nv/src/riva_include.h
+++ b/driver/xf86-video-nv/src/riva_include.h
@@ -25,6 +25,7 @@
 #include "micmap.h"
 
 #include "xf86DDC.h"
+#include "xf86Modes.h"
 
 #include "vbe.h"