diff --git a/src/core/surfaces.h b/src/core/surfaces.h
index dc0f3ee..72ea64f 100644
--- a/src/core/surfaces.h
+++ b/src/core/surfaces.h
@@ -1,4 +1,5 @@
 /*
+   (c) Copyright 2007-2009  Intel Corporation.
    (c) Copyright 2001-2007  The DirectFB Organization (directfb.org)
    (c) Copyright 2000-2004  Convergence (integrated media) GmbH
 
@@ -38,10 +39,10 @@
 #include <fusion/lock.h>
 #include <fusion/reactor.h>
 
-#include <core/coretypes.h>
-#include <core/coredefs.h>
+#include <src/core/coretypes.h>
+#include <src/core/coredefs.h>
 
-#include <core/gfxcard.h>
+#include <src/core/gfxcard.h>
 
 
 struct _Chunk;
@@ -147,6 +148,8 @@ struct _SurfaceBuffer
      CoreSurface            *surface;   /* always pointing to the surface this
                                            buffer belongs to, surfacemanger
                                            always depends on this! */
+
+     void                   *buffer_data;/* Keeps driver's specific data */
 };
 
 struct _CoreSurface