diff -Nru pvr-omap4-1.9.0.5.1.1/debian/changelog pvr-omap4-1.9.0.5.1.1/debian/changelog
--- pvr-omap4-1.9.0.5.1.1/debian/changelog	2012-08-28 08:55:15.000000000 +0000
+++ pvr-omap4-1.9.0.5.1.1/debian/changelog	2012-08-29 07:01:33.000000000 +0000
@@ -1,3 +1,10 @@
+pvr-omap4 (1.9.0.5.1.1-0ubuntu4) quantal; urgency=low
+
+  * debian/dkms/patches/0005-fixing-include-omapdrm-files.patch:
+    - Fixing OMAP DRM include headers (still part of staging)
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>  Wed, 29 Aug 2012 00:00:27 -0700
+
 pvr-omap4 (1.9.0.5.1.1-0ubuntu3) quantal; urgency=low
 
   * Rename build to build-arch and make build depend on build-arch.
diff -Nru pvr-omap4-1.9.0.5.1.1/debian/dkms/patches/0005-fixing-include-omapdrm-files.patch pvr-omap4-1.9.0.5.1.1/debian/dkms/patches/0005-fixing-include-omapdrm-files.patch
--- pvr-omap4-1.9.0.5.1.1/debian/dkms/patches/0005-fixing-include-omapdrm-files.patch	1970-01-01 00:00:00.000000000 +0000
+++ pvr-omap4-1.9.0.5.1.1/debian/dkms/patches/0005-fixing-include-omapdrm-files.patch	2012-08-29 07:00:05.000000000 +0000
@@ -0,0 +1,87 @@
+Description: Fixing include of omapdrm specific headers
+ Omap DRM headers is not yet part of the include files, as it's
+ still part of the staging tree, so let it deal with the right
+ directory by setting up INCLUDEDIR correctly.
+Forwarded: not-needed
+Author: Ricardo Salveti <rsalveti@linaro.org>
+
+diff --git a/services4/srvkm/common/devicemem.c b/services4/srvkm/common/devicemem.c
+index dd90c3f..b541582 100644
+--- a/services4/srvkm/common/devicemem.c
++++ b/services4/srvkm/common/devicemem.c
+@@ -60,7 +60,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #endif
+ 
+ #if defined(SUPPORT_DRI_DRM_EXTERNAL)
+-#  include <linux/omap_drv.h>
++#  include "omap_drv.h"
+ #  include "perproc.h"
+ #  include "env_perproc.h"
+ extern int pvr_mapper_id;
+diff --git a/services4/srvkm/common/pvrsrv.c b/services4/srvkm/common/pvrsrv.c
+index 817df73..59a7968 100644
+--- a/services4/srvkm/common/pvrsrv.c
++++ b/services4/srvkm/common/pvrsrv.c
+@@ -59,7 +59,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #include "lists.h"
+ 
+ #ifdef SUPPORT_DRI_DRM_EXTERNAL
+-#  include <linux/omap_drv.h>
++#  include "omap_drv.h"
+ #endif
+ 
+ IMG_UINT32	g_ui32InitFlags;
+diff --git a/services4/srvkm/env/linux/mm.c b/services4/srvkm/env/linux/mm.c
+index f60502d..94c71e8 100644
+--- a/services4/srvkm/env/linux/mm.c
++++ b/services4/srvkm/env/linux/mm.c
+@@ -1771,7 +1771,7 @@ LinuxMemAreaStructAlloc(IMG_VOID)
+ }
+ 
+ #if defined(SUPPORT_DRI_DRM_EXTERNAL)
+-#  include <linux/omap_drv.h>
++#  include "omap_drv.h"
+ #endif /* SUPPORT_DRI_DRM_EXTERNAL */
+ 
+ 
+diff --git a/services4/srvkm/env/linux/mmap.c b/services4/srvkm/env/linux/mmap.c
+index 7d561f2..1d09131 100644
+--- a/services4/srvkm/env/linux/mmap.c
++++ b/services4/srvkm/env/linux/mmap.c
+@@ -365,7 +365,7 @@ DetermineUsersSizeAndByteOffset(LinuxMemArea *psLinuxMemArea,
+ }
+ 
+ #if defined(SUPPORT_DRI_DRM_EXTERNAL)
+-#include <linux/omap_drv.h>
++#include "omap_drv.h"
+ #include "syscommon.h"
+ static struct omap_gem_vm_ops gem_ops;
+ static struct drm_gem_object *
+diff --git a/services4/srvkm/env/linux/private_data.h b/services4/srvkm/env/linux/private_data.h
+index 10c6b84..4192839 100644
+--- a/services4/srvkm/env/linux/private_data.h
++++ b/services4/srvkm/env/linux/private_data.h
+@@ -92,7 +92,7 @@ typedef struct
+ PVRSRV_FILE_PRIVATE_DATA;
+ 
+ #if defined(SUPPORT_DRI_DRM_EXTERNAL)
+-#include <linux/omap_drv.h>
++#include "omap_drv.h"
+ extern int pvr_mapper_id;
+ static inline PVRSRV_FILE_PRIVATE_DATA * get_private(struct drm_file *file)
+ {
+diff --git a/services4/srvkm/env/linux/pvr_drm.c b/services4/srvkm/env/linux/pvr_drm.c
+index 0ca9b8d..ed0c7d5 100644
+--- a/services4/srvkm/env/linux/pvr_drm.c
++++ b/services4/srvkm/env/linux/pvr_drm.c
+@@ -60,8 +60,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #include <drm/drm.h>
+ 
+ #if defined(SUPPORT_DRI_DRM_EXTERNAL)
+-#  include <linux/omap_drm.h>
+-#  include <linux/omap_drv.h>
++#  include "omap_drm.h"
++#  include "omap_drv.h"
+ #endif
+ 
+ #include "img_defs.h"
diff -Nru pvr-omap4-1.9.0.5.1.1/debian/dkms.conf.in pvr-omap4-1.9.0.5.1.1/debian/dkms.conf.in
--- pvr-omap4-1.9.0.5.1.1/debian/dkms.conf.in	2012-08-28 08:04:56.000000000 +0000
+++ pvr-omap4-1.9.0.5.1.1/debian/dkms.conf.in	2012-08-29 07:00:23.000000000 +0000
@@ -9,3 +9,4 @@
 PATCH[1]="0002-km-fix-issues-w-mapping-2d-buffer.patch"
 PATCH[2]="0003-build-failure.patch"
 PATCH[3]="0004-dont-need-to-run-dos2unix.patch"
+PATCH[4]="0005-fixing-include-omapdrm-files.patch"