5 files changed, 10 insertions, 16 deletions
diff --git a/make/config/nativewindow/jawt-macosx.cfg b/make/config/nativewindow/jawt-macosx.cfg
index 5f6bbfd21..f19a8476c 100644
--- a/make/config/nativewindow/jawt-macosx.cfg
+++ b/make/config/nativewindow/jawt-macosx.cfg
@@ -3,7 +3,6 @@
 Include jawt-common.cfg
 NativeOutputDir gensrc/native/MacOSX
 
-Opaque long void *
 Opaque long NSView *
 Opaque long CALayer *
 
diff --git a/make/config/nativewindow/jawt-win32.cfg b/make/config/nativewindow/jawt-win32.cfg
index 5b571f719..85af8c71c 100644
--- a/make/config/nativewindow/jawt-win32.cfg
+++ b/make/config/nativewindow/jawt-win32.cfg
@@ -3,13 +3,17 @@
 Include jawt-common.cfg
 NativeOutputDir gensrc/native/Windows
 
-Opaque long HDC
+Opaque long HANDLE
 
 IgnoreField JAWT_Win32DrawingSurfaceInfo null
 IgnoreField JAWT_Win32DrawingSurfaceInfo hpalette
 
+CustomCCode #define WIN32_LEAN_AND_MEAN
+CustomCCode #include <windows.h>
+CustomCCode #undef WIN32_LEAN_AND_MEAN
 CustomCCode #include <gluegen_stdint.h>
 CustomCCode #include <gluegen_stddef.h>
+CustomCCode #include <wingdi.h>
 
 StructPackage JAWT_Win32DrawingSurfaceInfo jogamp.nativewindow.jawt.windows
 EmitStruct JAWT_Win32DrawingSurfaceInfo
diff --git a/make/config/nativewindow/jawt-x11.cfg b/make/config/nativewindow/jawt-x11.cfg
index 05db2aa0c..5038ad32b 100644
--- a/make/config/nativewindow/jawt-x11.cfg
+++ b/make/config/nativewindow/jawt-x11.cfg
@@ -3,7 +3,7 @@
 Include jawt-common.cfg
 NativeOutputDir gensrc/native/X11
 
-Opaque long Drawable
+Opaque long XID
 Opaque long Display *
 
 IgnoreField JAWT_X11DrawingSurfaceInfo GetAWTColor
diff --git a/make/config/nativewindow/win32-lib.cfg b/make/config/nativewindow/win32-lib.cfg
index 9c60348d2..3a8fdd66a 100644
--- a/make/config/nativewindow/win32-lib.cfg
+++ b/make/config/nativewindow/win32-lib.cfg
@@ -11,15 +11,6 @@ Opaque boolean BOOL
 Opaque int HRESULT
 Opaque long HANDLE
 Opaque long PROC
-Opaque long HINSTANCE
-Opaque long HWND
-Opaque long HBITMAP
-Opaque long HDC
-Opaque long HGDIOBJ
-Opaque long HGLRC
-Opaque long HRGN
-Opaque long HPBUFFERARB
-Opaque long HPBUFFEREXT
 Opaque long void **
 
 Import com.jogamp.nativewindow.util.Point
@@ -30,7 +21,6 @@ import jogamp.nativewindow.Debug
 CustomCCode #define WIN32_LEAN_AND_MEAN
 CustomCCode #include <windows.h>
 CustomCCode #undef WIN32_LEAN_AND_MEAN
-
 CustomCCode #include <gluegen_stdint.h>
 CustomCCode #include <gluegen_stddef.h>
 CustomCCode #include <wingdi.h>
diff --git a/make/config/nativewindow/x11-lib.cfg b/make/config/nativewindow/x11-lib.cfg
index 8104b4697..66bd19362 100644
--- a/make/config/nativewindow/x11-lib.cfg
+++ b/make/config/nativewindow/x11-lib.cfg
@@ -16,11 +16,11 @@ Import com.jogamp.nativewindow.util.Point
 
 # XID needs to be treated as a long for 32/64 bit compatibility
 Opaque long XID
-
-Opaque long Display *
 Opaque boolean Bool
-Opaque long GLXFBConfig
+Opaque long Display *
 Opaque long Visual *
+Opaque long GLXContext
+Opaque long GLXFBConfig
 Opaque long void *
 
 IncludeAs CustomJavaCode X11Lib x11-CustomJavaCode.java
@@ -48,4 +48,5 @@ CustomCCode #include <X11/Xlib.h>
 CustomCCode #include <X11/Xutil.h>
 CustomCCode #include <X11/extensions/Xrender.h>
 CustomCCode #include <XineramaHelper.h>
+CustomCCode #include <Xmisc.h>