diff -ruN netbeans-platform-7.0.1/keyring.impl/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java netbeans-platform-7.0.1/keyring.impl/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java
--- netbeans-platform-7.0.1/keyring.impl/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java	2011-07-28 20:46:04.000000000 -0400
+++ netbeans-platform-7.0.1/keyring.impl/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java	2013-09-03 13:37:51.284426138 -0400
@@ -46,6 +46,8 @@
 import com.sun.jna.Native;
 import com.sun.jna.Pointer;
 import com.sun.jna.Structure;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * JNA wrapper for certain functions from GNOME Keyring API.
@@ -97,6 +99,12 @@
         public int item_id;
         public /*GnomeKeyringAttributeList*/Pointer attributes;
         public String secret;
+        protected List getFieldOrder() {
+            return Arrays.asList("keyring",
+                                 "item_id",
+                                 "attributes",
+                                 "secret");
+        }
     }
 
     /** http://library.gnome.org/devel/glib/2.6/glib-Miscellaneous-Utility-Functions.html#g-set-application-name */
diff -ruN netbeans-platform-7.0.1/keyring.impl/src/org/netbeans/modules/keyring/win32/Win32Protect.java netbeans-platform-7.0.1/keyring.impl/src/org/netbeans/modules/keyring/win32/Win32Protect.java
--- netbeans-platform-7.0.1/keyring.impl/src/org/netbeans/modules/keyring/win32/Win32Protect.java	2011-07-28 20:46:04.000000000 -0400
+++ netbeans-platform-7.0.1/keyring.impl/src/org/netbeans/modules/keyring/win32/Win32Protect.java	2013-09-03 13:37:51.285426149 -0400
@@ -49,6 +49,7 @@
 import com.sun.jna.WString;
 import com.sun.jna.win32.StdCallLibrary;
 import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -170,6 +171,10 @@
         void zero() {
             ((Memory) pbData).clear();
         }
+        protected List getFieldOrder() {
+            return Arrays.asList("cbData",
+                                 "pbData");
+        }
     }
 
 }
diff -ruN netbeans-platform-7.0.1/masterfs/src/org/netbeans/modules/masterfs/watcher/FAMNotifier.java netbeans-platform-7.0.1/masterfs/src/org/netbeans/modules/masterfs/watcher/FAMNotifier.java
--- netbeans-platform-7.0.1/masterfs/src/org/netbeans/modules/masterfs/watcher/FAMNotifier.java	2011-07-28 20:46:08.000000000 -0400
+++ netbeans-platform-7.0.1/masterfs/src/org/netbeans/modules/masterfs/watcher/FAMNotifier.java	2013-09-03 13:37:51.285426149 -0400
@@ -48,8 +48,10 @@
 import com.sun.jna.Structure;
 import com.sun.jna.Structure.ByReference;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -110,6 +112,10 @@
             public static class Reference extends FAMConnection implements ByReference {}
             public int fd;
             public Pointer client;
+            protected List getFieldOrder() {
+                return Arrays.asList("fd",
+                                     "client");
+            }
         }
 
         static class FAMRequest extends Structure {
@@ -124,6 +130,10 @@
             }
 
             public int reqnum;
+
+            protected List getFieldOrder() {
+                return Arrays.asList("reqnum");
+            }
         };
 
         public static final int PATH_MAX = 1024;
@@ -145,6 +155,15 @@
             public byte[] filename = new byte[PATH_MAX];   /* file changed */
             public Pointer userdata;            /* userdata associated with this monitor req. */
             public int code;             /* What happened to file - see above */
+
+            protected List getFieldOrder() {
+                return Arrays.asList("fc",
+                                     "fr",
+                                     "hostname",
+                                     "filename",
+                                     "userdata",
+                                     "code");
+            }
         }
 
 
diff -ruN netbeans-platform-7.0.1/masterfs/src/org/netbeans/modules/masterfs/watcher/WindowsNotifier.java netbeans-platform-7.0.1/masterfs/src/org/netbeans/modules/masterfs/watcher/WindowsNotifier.java
--- netbeans-platform-7.0.1/masterfs/src/org/netbeans/modules/masterfs/watcher/WindowsNotifier.java	2011-07-28 20:46:08.000000000 -0400
+++ netbeans-platform-7.0.1/masterfs/src/org/netbeans/modules/masterfs/watcher/WindowsNotifier.java	2013-09-03 13:47:15.308275028 -0400
@@ -49,7 +49,9 @@
 import com.sun.jna.ptr.ByReference;
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import com.sun.jna.ptr.IntByReference;
@@ -113,6 +115,14 @@
         public int Offset;
         public int OffsetHigh;
         public HANDLE hEvent;
+
+        protected List getFieldOrder() {
+            return Arrays.asList("Internal",
+                                 "InternalHigh",
+                                 "Offset",
+                                 "OffsetHigh",
+                                 "hEvent");
+        }
     }
 
     public static HANDLE INVALID_HANDLE_VALUE = new HANDLE(Pointer.createConstant(
@@ -185,12 +195,25 @@
             next.read();
             return next;
         }
+
+        protected List getFieldOrder() {
+            return Arrays.asList("NextEntryOffset",
+                                 "Action",
+                                 "FielNameLength",
+                                 "FileName");
+        }
     }
 
     public static class SECURITY_ATTRIBUTES extends Structure {
         public final int nLength = size();
         public Pointer lpSecurityDescriptor;
         public boolean bInheritHandle;
+
+        protected List getFieldOrder() {
+            return Arrays.asList("nLength",
+                                 "lpSecurityDescriptor",
+                                 "bInheritHandle");
+        }
     }
 
     interface Kernel32 extends StdCallLibrary {