intel: minor header cleanup
diff --git a/icd/intel/dev.h b/icd/intel/dev.h
index 3f2a850..d71e7bb 100644
--- a/icd/intel/dev.h
+++ b/icd/intel/dev.h
@@ -26,8 +26,8 @@
#define DEV_H
#include "intel.h"
-#include "obj.h"
#include "gpu.h"
+#include "obj.h"
struct intel_queue;
struct intel_winsys;
diff --git a/icd/intel/event.h b/icd/intel/event.h
index a8a7767..a3d4a40 100644
--- a/icd/intel/event.h
+++ b/icd/intel/event.h
@@ -25,6 +25,9 @@
#ifndef EVENT_H
#define EVENT_H
+#include "intel.h"
+#include "obj.h"
+
struct intel_dev;
struct intel_event {
diff --git a/icd/intel/mem.h b/icd/intel/mem.h
index 16f0449..14b8c15 100644
--- a/icd/intel/mem.h
+++ b/icd/intel/mem.h
@@ -28,8 +28,6 @@
#include "kmd/winsys.h"
#include "intel.h"
-struct intel_bo;
-
struct intel_mem {
struct intel_base base;