4 files changed, 8 insertions, 6 deletions
diff --git a/make/config/nativewindow/jawt-win32.cfg b/make/config/nativewindow/jawt-win32.cfg
index d1fa7020a..5b571f719 100644
--- a/make/config/nativewindow/jawt-win32.cfg
+++ b/make/config/nativewindow/jawt-win32.cfg
@@ -8,7 +8,8 @@ Opaque long HDC
 IgnoreField JAWT_Win32DrawingSurfaceInfo null
 IgnoreField JAWT_Win32DrawingSurfaceInfo hpalette
 
-Include ../intptr.cfg
+CustomCCode #include <gluegen_stdint.h>
+CustomCCode #include <gluegen_stddef.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 ac9d1aa9a..05db2aa0c 100644
--- a/make/config/nativewindow/jawt-x11.cfg
+++ b/make/config/nativewindow/jawt-x11.cfg
@@ -8,7 +8,8 @@ Opaque long Display *
 
 IgnoreField JAWT_X11DrawingSurfaceInfo GetAWTColor
 
-CustomCCode #include <inttypes.h>
+CustomCCode #include <gluegen_stdint.h>
+CustomCCode #include <gluegen_stddef.h>
 
 StructPackage JAWT_X11DrawingSurfaceInfo jogamp.nativewindow.jawt.x11
 EmitStruct JAWT_X11DrawingSurfaceInfo
diff --git a/make/config/nativewindow/win32-lib.cfg b/make/config/nativewindow/win32-lib.cfg
index 894211182..b8886bdac 100644
--- a/make/config/nativewindow/win32-lib.cfg
+++ b/make/config/nativewindow/win32-lib.cfg
@@ -29,10 +29,9 @@ 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>
-CustomCCode #include <stddef.h>
-
-Include ../intptr.cfg
 
 CustomCCode extern HINSTANCE   GetApplicationHandle();
 
diff --git a/make/config/nativewindow/x11-lib.cfg b/make/config/nativewindow/x11-lib.cfg
index 8848980ea..d9e4ccd0a 100644
--- a/make/config/nativewindow/x11-lib.cfg
+++ b/make/config/nativewindow/x11-lib.cfg
@@ -39,7 +39,8 @@ CustomJavaCode X11Lib private static int getFirstElement(int[] arr, int offset)
 
 CustomJavaCode XVisualInfo public static XVisualInfo create(XVisualInfo s) { XVisualInfo d = XVisualInfo.create(); d.getBuffer().put(s.getBuffer()); d.getBuffer().rewind(); s.getBuffer().rewind(); return d; }
 
-CustomCCode #include <inttypes.h>
+CustomCCode #include <gluegen_stdint.h>
+CustomCCode #include <gluegen_stddef.h>
 CustomCCode #include <X11/Xlib.h>
 CustomCCode #include <X11/Xutil.h>