diff --git a/src/video/fbcon/SDL_fbriva.c b/src/video/fbcon/SDL_fbriva.c
index bb0c600ca..6f02657c9 100644
--- a/src/video/fbcon/SDL_fbriva.c
+++ b/src/video/fbcon/SDL_fbriva.c
@@ -32,17 +32,6 @@ static char rcsid =
 #include "riva_mmio.h"
 #include "riva_regs.h"
 
-#define PGRAPH_OFFSET	0x00400000
-#define FIFO_OFFSET	0x00800000
-#define ROP_OFFSET	FIFO_OFFSET+0x00000000
-#define CLIP_OFFSET	FIFO_OFFSET+0x00002000
-#define PATT_OFFSET	FIFO_OFFSET+0x00004000
-#define PIXMAP_OFFSET	FIFO_OFFSET+0x00006000
-#define BLT_OFFSET	FIFO_OFFSET+0x00008000
-#define BITMAP_OFFSET	FIFO_OFFSET+0x0000A000
-#define LINE_OFFSET	FIFO_OFFSET+0x0000C000
-#define TRI03_OFFSET	FIFO_OFFSET+0x0000E000
-#define PCIO_OFFSET	0x00601000
 
 static int FifoEmptyCount = 0;
 static int FifoFreeCount = 0;
diff --git a/src/video/fbcon/SDL_fbriva.h b/src/video/fbcon/SDL_fbriva.h
index 7dbca7c1a..61f578431 100644
--- a/src/video/fbcon/SDL_fbriva.h
+++ b/src/video/fbcon/SDL_fbriva.h
@@ -29,5 +29,12 @@ static char rcsid =
 
 #include "SDL_fbvideo.h"
 
+#ifndef FB_ACCEL_NV3
+#define FB_ACCEL_NV3	27
+#endif
+#ifndef FB_ACCEL_NV4
+#define FB_ACCEL_NV4	28
+#endif
+
 /* Set up the driver for Riva acceleration */
 extern void FB_RivaAccel(_THIS, __u32 card);