#include "main/mtypes.h"
#include "main/macros.h"
#include "main/formats.h"
+#include "main/state.h"
#include "utils.h"
#include "dri_util.h"
#undef NDEBUG
#include <assert.h>
-#include "nouveau_device.h"
-#include "nouveau_grobj.h"
-#include "nouveau_channel.h"
-#include "nouveau_bo.h"
-#include "nouveau_notifier.h"
+#include <libdrm/nouveau.h>
#include "nouveau_screen.h"
#include "nouveau_state.h"
#include "nouveau_surface.h"
-#include "nv04_pushbuf.h"
+#include "nouveau_local.h"
-#define DRIVER_DATE "20091015"
#define DRIVER_AUTHOR "Nouveau"
struct nouveau_driver {