--- old/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.h	2017-08-15 12:14:05.368964278 -0700
+++ new/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.h	2017-08-15 12:14:05.092964286 -0700
@@ -28,8 +28,6 @@
 #include "awt_p.h"
 #include "awt_GraphicsEnv.h"
 
-#include <jdga.h>
-
 #ifdef HEADLESS
 #include "GLXGraphicsConfig.h"
 #endif
@@ -105,11 +103,8 @@
     GC                  cachedGC;      /* cached for use in X11SD_Unlock() */
     jint                depth;
     jint                pixelmask;
-    JDgaSurfaceInfo     surfInfo;
     AwtGraphicsConfigData *configData;
     ColorData           *cData;
-    jboolean            dgaAvailable;
-    void                *dgaDev;
     Pixmap              bitmask;
     jint                bgPixel;       /* bg pixel for the pixmap */
     jboolean            isBgInitialized; /* whether the bg pixel is valid */
@@ -124,7 +119,6 @@
 #define X11SD_LOCK_UNLOCKED     0       /* surface is not locked */
 #define X11SD_LOCK_BY_NULL      1       /* surface locked for NOP */
 #define X11SD_LOCK_BY_XIMAGE    2       /* surface locked by Get/PutImage */
-#define X11SD_LOCK_BY_DGA       3       /* surface locked by DGA */
 #define X11SD_LOCK_BY_SHMEM     4       /* surface locked by ShMemExt */
 
 #ifdef MITSHM