diff --git a/icd/intel/driver.h b/icd/intel/driver.h
index c84b6eb..3b65b58 100644
--- a/icd/intel/driver.h
+++ b/icd/intel/driver.h
@@ -28,11 +28,7 @@
 #ifndef __DRIVER_H_INCLUDED__
 #define __DRIVER_H_INCLUDED__
 
-#include <stdio.h>
-
-#include "xgl.h"
-#include "xglDbg.h"
-#include "icd.h"
+#include "intel.h"
 
 /**
  * Typedefs for all XGL API entrypoint functions.
diff --git a/icd/intel/intel.h b/icd/intel/intel.h
new file mode 100644
index 0000000..31825b8
--- /dev/null
+++ b/icd/intel/intel.h
@@ -0,0 +1,36 @@
+/*
+ * XGL
+ *
+ * Copyright (C) 2014 LunarG, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef INTEL_H
+#define INTEL_H
+
+#include <stdbool.h>
+#include <assert.h>
+
+#include <xgl.h>
+#include <xglDbg.h>
+
+#include "icd.h"
+
+#endif /* INTEL_H */