diff --git a/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Coder.java b/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Coder.java
index 6087f1fd07691cee70189a51394e5cb62b7ec05b..9efc76e9c055ea5738ae46d0bef4ecc77bda8e46 100644
--- a/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Coder.java
+++ b/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Coder.java
@@ -35,26 +35,25 @@ import com.apple.jobjc.PrimitiveCoder.SCharCoder;
 import com.apple.jobjc.PrimitiveCoder.SIntCoder;
 import com.apple.jobjc.PrimitiveCoder.SLongLongCoder;
 import com.apple.jobjc.PrimitiveCoder.SShortCoder;
-import java.lang.annotation.Native;
 
 public abstract class Coder<T> {
     private static native long getNativeFFITypePtrForCode(final int code);
 
-    @Native static final int FFI_VOID        = 0;
-    @Native static final int FFI_PTR        = FFI_VOID+1;
-
-    @Native static final int FFI_SINT8        = FFI_PTR+1;
-    @Native static final int FFI_UINT8        = FFI_SINT8+1;
-    @Native static final int FFI_SINT16        = FFI_UINT8+1;
-    @Native static final int FFI_UINT16        = FFI_SINT16+1;
-    @Native static final int FFI_SINT32        = FFI_UINT16+1;
-    @Native static final int FFI_UINT32        = FFI_SINT32+1;
-    @Native static final int FFI_SINT64        = FFI_UINT32+1;
-    @Native static final int FFI_UINT64        = FFI_SINT64+1;
-
-    @Native static final int FFI_FLOAT        = FFI_UINT64+1;
-    @Native static final int FFI_DOUBLE        = FFI_FLOAT+1;
-    @Native static final int FFI_LONGDOUBLE    = FFI_DOUBLE+1;
+    static final int FFI_VOID        = 0;
+    static final int FFI_PTR        = FFI_VOID+1;
+
+    static final int FFI_SINT8        = FFI_PTR+1;
+    static final int FFI_UINT8        = FFI_SINT8+1;
+    static final int FFI_SINT16        = FFI_UINT8+1;
+    static final int FFI_UINT16        = FFI_SINT16+1;
+    static final int FFI_SINT32        = FFI_UINT16+1;
+    static final int FFI_UINT32        = FFI_SINT32+1;
+    static final int FFI_SINT64        = FFI_UINT32+1;
+    static final int FFI_UINT64        = FFI_SINT64+1;
+
+    static final int FFI_FLOAT        = FFI_UINT64+1;
+    static final int FFI_DOUBLE        = FFI_FLOAT+1;
+    static final int FFI_LONGDOUBLE    = FFI_DOUBLE+1;
 
     private static long[] ffiCodesToFFITypePtrs;
     static{
diff --git a/src/share/classes/sun/java2d/opengl/OGLContext.java b/src/share/classes/sun/java2d/opengl/OGLContext.java
index be1e27f34a3db226343ec4e39851ffd8779fed62..e3ac65f92c29b1e3c884e27fa79385dae648e25d 100644
--- a/src/share/classes/sun/java2d/opengl/OGLContext.java
+++ b/src/share/classes/sun/java2d/opengl/OGLContext.java
@@ -161,32 +161,39 @@ public class OGLContext extends BufferedContext {
          * This cap will only be set if the fbobject system property has been
          * enabled and we are able to create an FBO with depth buffer.
          */
-    @Native static final int CAPS_EXT_FBOBJECT     =
+        @Native
+        static final int CAPS_EXT_FBOBJECT     =
                 (CAPS_RT_TEXTURE_ALPHA | CAPS_RT_TEXTURE_OPAQUE);
         /** Indicates that the context supports a stored alpha channel. */
-    @Native static final int CAPS_STORED_ALPHA     = CAPS_RT_PLAIN_ALPHA;
+        @Native
+        static final int CAPS_STORED_ALPHA     = CAPS_RT_PLAIN_ALPHA;
         /** Indicates that the context is doublebuffered. */
-    @Native static final int CAPS_DOUBLEBUFFERED   = (FIRST_PRIVATE_CAP << 0);
+        @Native
+        static final int CAPS_DOUBLEBUFFERED   = (FIRST_PRIVATE_CAP << 0);
         /**
          * Indicates the presence of the GL_ARB_fragment_shader extension.
          * This cap will only be set if the lcdshader system property has been
          * enabled and the hardware supports the minimum number of texture units
          */
-    @Native static final int CAPS_EXT_LCD_SHADER   = (FIRST_PRIVATE_CAP << 1);
+        @Native
+        static final int CAPS_EXT_LCD_SHADER   = (FIRST_PRIVATE_CAP << 1);
         /**
          * Indicates the presence of the GL_ARB_fragment_shader extension.
          * This cap will only be set if the biopshader system property has been
          * enabled and the hardware meets our minimum requirements.
          */
-    @Native static final int CAPS_EXT_BIOP_SHADER  = (FIRST_PRIVATE_CAP << 2);
+        @Native
+        static final int CAPS_EXT_BIOP_SHADER  = (FIRST_PRIVATE_CAP << 2);
         /**
          * Indicates the presence of the GL_ARB_fragment_shader extension.
          * This cap will only be set if the gradshader system property has been
          * enabled and the hardware meets our minimum requirements.
          */
-    @Native static final int CAPS_EXT_GRAD_SHADER  = (FIRST_PRIVATE_CAP << 3);
+        @Native
+        static final int CAPS_EXT_GRAD_SHADER  = (FIRST_PRIVATE_CAP << 3);
         /** Indicates the presence of the GL_ARB_texture_rectangle extension. */
-    @Native static final int CAPS_EXT_TEXRECT      = (FIRST_PRIVATE_CAP << 4);
+        @Native
+        static final int CAPS_EXT_TEXRECT      = (FIRST_PRIVATE_CAP << 4);
 
         OGLContextCaps(int caps, String adapterId) {
             super(caps, adapterId);