Removed some unneeded #includes
Change-Id: Id51fcceebd81e7a489b49379a129f238964c09d5
diff --git a/src/armsoc_driver.c b/src/armsoc_driver.c
index 6f82c2d..0817038 100644
--- a/src/armsoc_driver.c
+++ b/src/armsoc_driver.c
@@ -36,6 +36,12 @@
#endif
#include "armsoc_driver.h"
+
+#include "micmap.h"
+
+#include "xf86cmap.h"
+#include "xf86RandR12.h"
+
#include "compat-api.h"
#include "drmmode_driver.h"
diff --git a/src/armsoc_driver.h b/src/armsoc_driver.h
index f2d26d3..118cf0d 100644
--- a/src/armsoc_driver.h
+++ b/src/armsoc_driver.h
@@ -30,38 +30,15 @@
#ifndef __ARMSOC_DRV_H__
#define __ARMSOC_DRV_H__
-/* All drivers need the following headers: */
-#include "xorg-server.h"
#include "xf86.h"
-#include "xf86_OSproc.h"
-
-/* XXX - Perhaps, the following header files will only be used temporarily
- * (i.e. so we can use fbdevHW, SW cursor, etc):
- * XXX - figure out what can be removed..
- */
-#include "mipointer.h"
-#include "micmap.h"
-#include "colormapst.h"
-#include "xf86cmap.h"
-#include "shadow.h"
-/* for visuals */
-#include "fb.h"
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#include "xf86RAC.h"
#endif
-#include "xf86Crtc.h"
-#include "xf86RandR12.h"
#include "xf86drm.h"
-#include "dri2.h"
-
-#include "armsoc_dumb.h"
-
#include <errno.h>
-
#include "armsoc_exa.h"
-
#define ARMSOC_VERSION 1000 /* Apparently not used by X server */
#define ARMSOC_NAME "ARMSOC" /* Name used to prefix messages */
#define ARMSOC_DRIVER_NAME "armsoc" /* Driver name as used in config file */
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index fcacdb3..7fe3501 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -32,43 +32,8 @@
#include "config.h"
#endif
-/* TODO: MIDEGL-1430: cleanup #includes, remove unnecessary ones */
-
-#include "xorg-server.h"
-#include "xorgVersion.h"
-
-#include <sys/stat.h>
-
-#include <string.h>
-#include <math.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-/* All drivers should typically include these */
-#include "xf86.h"
-#include "xf86_OSproc.h"
-#define PPC_MMIO_IS_BE
-#include "compiler.h"
-#include "mipointer.h"
-
-#include "micmap.h"
-
#include "xf86DDC.h"
-#include "xf86RandR12.h"
-#include "dixstruct.h"
-#include "scrnintstr.h"
-#include "fb.h"
-#include "xf86cmap.h"
-
-#include "xf86Cursor.h"
-#include "xf86DDC.h"
-
-#include "region.h"
-
-#include <X11/extensions/randr.h>
-
#ifdef HAVE_XEXTPROTO_71
#include <X11/extensions/dpmsconst.h>
#else
@@ -78,14 +43,11 @@
#include "armsoc_driver.h"
-#include "xf86Crtc.h"
-
#include "xf86drmMode.h"
#include "drm_fourcc.h"
#include "X11/Xatom.h"
#include <libudev.h>
-
#include "drmmode_driver.h"
typedef struct {