diff --git a/src/java.desktop/share/native/common/font/fontscalerdefs.h b/src/java.desktop/share/native/common/font/fontscalerdefs.h
index 520ba406e04..4b391466403 100644
--- a/src/java.desktop/share/native/common/font/fontscalerdefs.h
+++ b/src/java.desktop/share/native/common/font/fontscalerdefs.h
@@ -103,7 +103,7 @@ typedef struct GlyphInfo {
  * FileFontStrike logic - presence of context is used as marker to
  * free the memory.
 */
-JNIEXPORT int isNullScalerContext(void *context);
+int isNullScalerContext(void *context);
 
 #ifdef  __cplusplus
 }
diff --git a/src/java.desktop/share/native/common/font/sunfontids.h b/src/java.desktop/share/native/common/font/sunfontids.h
index 2301f80b5bc..5f764e241cb 100644
--- a/src/java.desktop/share/native/common/font/sunfontids.h
+++ b/src/java.desktop/share/native/common/font/sunfontids.h
@@ -82,10 +82,7 @@ typedef struct FontManagerNativeIDs {
       glyphImages, glyphListUsePos, glyphListPos, lcdRGBOrder, lcdSubPixPos;
 } FontManagerNativeIDs;
 
-/* Note: we share variable in the context of fontmanager lib
-   but we need access method to use it from separate rasterizer lib */
 extern FontManagerNativeIDs sunFontIDs;
-JNIEXPORT FontManagerNativeIDs getSunFontIDs(JNIEnv* env);
 
 #ifdef  __cplusplus
 }
diff --git a/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.h b/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.h
index 031d133edae..62c52450f55 100644
--- a/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.h
+++ b/src/java.desktop/share/native/libawt/awt/image/imageInitIDs.h
@@ -74,7 +74,6 @@ IMGEXTERN jfieldID g_ICRdataOffsetsID;
 IMGEXTERN jfieldID g_ICRtypeID;
 
 /* Color Model ids */
-JNIEXPORT
 IMGEXTERN jfieldID g_CMnBitsID;
 IMGEXTERN jfieldID g_CMcspaceID;
 IMGEXTERN jfieldID g_CMnumComponentsID;
diff --git a/src/java.desktop/share/native/libawt/java2d/SurfaceData.c b/src/java.desktop/share/native/libawt/java2d/SurfaceData.c
index ffff2bd09b4..4d96a2d3ff4 100644
--- a/src/java.desktop/share/native/libawt/java2d/SurfaceData.c
+++ b/src/java.desktop/share/native/libawt/java2d/SurfaceData.c
@@ -139,13 +139,13 @@ SurfaceData_GetOps(JNIEnv *env, jobject sData)
     return GetSDOps(env, sData, JNI_TRUE);
 }
 
-JNIEXPORT SurfaceDataOps * JNICALL
+SurfaceDataOps *
 SurfaceData_GetOpsNoSetup(JNIEnv *env, jobject sData)
 {
     return GetSDOps(env, sData, JNI_FALSE);
 }
 
-JNIEXPORT void JNICALL
+void
 SurfaceData_SetOps(JNIEnv *env, jobject sData, SurfaceDataOps *ops)
 {
     if (JNU_GetLongFieldAsPtr(env, sData, pDataID) == NULL) {
diff --git a/src/java.desktop/share/native/libawt/java2d/SurfaceData.h b/src/java.desktop/share/native/libawt/java2d/SurfaceData.h
index 745fd012e86..c4eae3c19aa 100644
--- a/src/java.desktop/share/native/libawt/java2d/SurfaceData.h
+++ b/src/java.desktop/share/native/libawt/java2d/SurfaceData.h
@@ -553,7 +553,7 @@ SurfaceData_GetOps(JNIEnv *env, jobject sData);
  * Does the same as the above, but doesn't call Setup function
  * even if it's set.
  */
-JNIEXPORT SurfaceDataOps * JNICALL
+SurfaceDataOps *
 SurfaceData_GetOpsNoSetup(JNIEnv *env, jobject sData);
 
 /*
@@ -569,7 +569,7 @@ SurfaceData_GetOpsNoSetup(JNIEnv *env, jobject sData);
  *      is called since this function will not leave any outstanding
  *      JNI Critical locks unreleased.
  */
-JNIEXPORT void JNICALL
+void
 SurfaceData_SetOps(JNIEnv *env, jobject sData, SurfaceDataOps *ops);
 
 /*
diff --git a/src/java.desktop/share/native/libawt/java2d/Trace.c b/src/java.desktop/share/native/libawt/java2d/Trace.c
index bba31f8b837..a2783a9b64c 100644
--- a/src/java.desktop/share/native/libawt/java2d/Trace.c
+++ b/src/java.desktop/share/native/libawt/java2d/Trace.c
@@ -31,6 +31,9 @@
 static int j2dTraceLevel = J2D_TRACE_INVALID;
 static FILE *j2dTraceFile = NULL;
 
+static void
+J2dTraceInit();
+
 JNIEXPORT void JNICALL
 J2dTraceImpl(int level, jboolean cr, const char *string, ...)
 {
@@ -72,7 +75,7 @@ J2dTraceImpl(int level, jboolean cr, const char *string, ...)
     }
 }
 
-JNIEXPORT void JNICALL
+static void
 J2dTraceInit()
 {
     char *j2dTraceLevelString = getenv("J2D_TRACE_LEVEL");
diff --git a/src/java.desktop/share/native/libawt/java2d/Trace.h b/src/java.desktop/share/native/libawt/java2d/Trace.h
index 322c63b0a60..b4fe41f77b0 100644
--- a/src/java.desktop/share/native/libawt/java2d/Trace.h
+++ b/src/java.desktop/share/native/libawt/java2d/Trace.h
@@ -52,8 +52,6 @@ extern "C" {
 
 JNIEXPORT void JNICALL
 J2dTraceImpl(int level, jboolean cr, const char *string, ...);
-JNIEXPORT void JNICALL
-J2dTraceInit();
 
 #ifndef DEBUG
 #define J2dTrace(level, string)
diff --git a/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.c b/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.c
index cb0dafe3dbc..3ff40a4ef4d 100644
--- a/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.c
+++ b/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -470,7 +470,7 @@ GrPrim_Sg2dGetCompInfo(JNIEnv *env, jobject sg2d,
     (*env)->DeleteLocalRef(env, comp);
 }
 
-JNIEXPORT jint JNICALL
+jint
 GrPrim_CompGetXorColor(JNIEnv *env, jobject comp)
 {
     jobject color;
@@ -511,7 +511,7 @@ GrPrim_Sg2dGetLCDTextContrast(JNIEnv *env, jobject sg2d)
 /*
  * Helper function for CompositeTypes.Xor
  */
-JNIEXPORT void JNICALL
+static void JNICALL
 GrPrim_CompGetXorInfo(JNIEnv *env, CompositeInfo *pCompInfo, jobject comp)
 {
     pCompInfo->rule = RULE_Xor;
@@ -522,7 +522,7 @@ GrPrim_CompGetXorInfo(JNIEnv *env, CompositeInfo *pCompInfo, jobject comp)
 /*
  * Helper function for CompositeTypes.AnyAlpha
  */
-JNIEXPORT void JNICALL
+static void JNICALL
 GrPrim_CompGetAlphaInfo(JNIEnv *env, CompositeInfo *pCompInfo, jobject comp)
 {
     pCompInfo->rule =
@@ -531,7 +531,7 @@ GrPrim_CompGetAlphaInfo(JNIEnv *env, CompositeInfo *pCompInfo, jobject comp)
         (*env)->GetFloatField(env, comp, extraAlphaID);
 }
 
-JNIEXPORT void JNICALL
+void
 Transform_GetInfo(JNIEnv *env, jobject txform, TransformInfo *pTxInfo)
 {
     pTxInfo->dxdx = (*env)->GetDoubleField(env, txform, m00ID);
@@ -542,7 +542,7 @@ Transform_GetInfo(JNIEnv *env, jobject txform, TransformInfo *pTxInfo)
     pTxInfo->ty   = (*env)->GetDoubleField(env, txform, m12ID);
 }
 
-JNIEXPORT void JNICALL
+void
 Transform_transform(TransformInfo *pTxInfo, jdouble *pX, jdouble *pY)
 {
     jdouble x = *pX;
diff --git a/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h b/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h
index 3ba7574a0d5..c3a42eee539 100644
--- a/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h
+++ b/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -510,12 +510,8 @@ extern JNIEXPORT void JNICALL
 GrPrim_Sg2dGetCompInfo(JNIEnv *env, jobject sg2d,
                        NativePrimitive *pPrim,
                        CompositeInfo *pCompInfo);
-extern JNIEXPORT jint JNICALL
+extern jint
 GrPrim_CompGetXorColor(JNIEnv *env, jobject comp);
-extern JNIEXPORT void JNICALL
-GrPrim_CompGetXorInfo(JNIEnv *env, CompositeInfo *pCompInfo, jobject comp);
-extern JNIEXPORT void JNICALL
-GrPrim_CompGetAlphaInfo(JNIEnv *env, CompositeInfo *pCompInfo, jobject comp);
 
 extern JNIEXPORT void JNICALL
 GrPrim_Sg2dGetClip(JNIEnv *env, jobject sg2d,
@@ -541,9 +537,9 @@ typedef struct {
     jdouble ty;
 } TransformInfo;
 
-extern JNIEXPORT void JNICALL
+extern void
 Transform_GetInfo(JNIEnv *env, jobject txform, TransformInfo *pTxInfo);
-extern JNIEXPORT void JNICALL
+extern void
 Transform_transform(TransformInfo *pTxInfo, jdouble *pX, jdouble *pY);
 
 void GrPrim_RefineBounds(SurfaceDataBounds *bounds, jint transX, jint transY,
diff --git a/src/java.desktop/share/native/libfontmanager/sunFont.c b/src/java.desktop/share/native/libfontmanager/sunFont.c
index 661dccae0c5..0461d61c26c 100644
--- a/src/java.desktop/share/native/libfontmanager/sunFont.c
+++ b/src/java.desktop/share/native/libfontmanager/sunFont.c
@@ -201,12 +201,6 @@ Java_sun_font_SunFontManager_initIDs
     initFontIDs(env);
 }
 
-JNIEXPORT FontManagerNativeIDs getSunFontIDs(JNIEnv *env) {
-
-    initFontIDs(env);
-    return sunFontIDs;
-}
-
 /*
  * Class:     sun_font_StrikeCache
  * Method:    freeIntPointer
diff --git a/src/java.desktop/unix/native/common/awt/X11Color.c b/src/java.desktop/unix/native/common/awt/X11Color.c
index b754f77537c..b1602bb5ae4 100644
--- a/src/java.desktop/unix/native/common/awt/X11Color.c
+++ b/src/java.desktop/unix/native/common/awt/X11Color.c
@@ -1230,8 +1230,6 @@ jobject awtJNI_GetColorModel(JNIEnv *env, AwtGraphicsConfigDataPtr aData)
 }
 #endif /* !HEADLESS */
 
-extern jfieldID colorValueID;
-
 #ifndef HEADLESS
 void
 awt_allocate_systemrgbcolors (jint *rgbColors, int num_colors,
diff --git a/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c b/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c
index 1be65e546ca..36d6feb6029 100644
--- a/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c
+++ b/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c
@@ -291,7 +291,7 @@ Java_sun_java2d_x11_XSurfaceData_flushNativeSurface(JNIEnv *env, jobject xsd)
 }
 
 
-JNIEXPORT X11SDOps * JNICALL
+X11SDOps *
 X11SurfaceData_GetOps(JNIEnv *env, jobject sData)
 {
 #ifdef HEADLESS
diff --git a/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.h b/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.h
index 66022f2426e..860c45f7fb0 100644
--- a/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.h
+++ b/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.h
@@ -163,5 +163,5 @@ jboolean XShared_initSurface(JNIEnv *env, X11SDOps *xsdo, jint depth, jint width
  *      is called since this function will not leave any outstanding
  *      JNI Critical locks unreleased.
  */
-JNIEXPORT X11SDOps * JNICALL
+X11SDOps *
 X11SurfaceData_GetOps(JNIEnv *env, jobject sData);
diff --git a/src/java.desktop/unix/native/libawt/awt/initIDs.c b/src/java.desktop/unix/native/libawt/awt/initIDs.c
index c5a8c0ea58d..d1c24c76af6 100644
--- a/src/java.desktop/unix/native/libawt/awt/initIDs.c
+++ b/src/java.desktop/unix/native/libawt/awt/initIDs.c
@@ -40,13 +40,10 @@
  * which are used in the win32 awt.
  */
 
-JNIEXPORT jfieldID colorValueID;
-
 JNIEXPORT void JNICALL
 Java_java_awt_Color_initIDs
   (JNIEnv *env, jclass clazz)
 {
-    colorValueID = (*env)->GetFieldID(env, clazz, "value", "I");
 }
 
 JNIEXPORT void JNICALL
diff --git a/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.cpp b/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.cpp
index 77528dc3330..6dae331f88f 100644
--- a/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.cpp
+++ b/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.cpp
@@ -471,7 +471,7 @@ Java_sun_java2d_windows_GDIWindowSurfaceData_initOps(JNIEnv *env, jobject wsd,
     wsdo->bmCopyToScreen = FALSE;
 }
 
-JNIEXPORT GDIWinSDOps * JNICALL
+GDIWinSDOps *
 GDIWindowSurfaceData_GetOps(JNIEnv *env, jobject sData)
 {
     SurfaceDataOps *ops = SurfaceData_GetOps(env, sData);
@@ -484,7 +484,7 @@ GDIWindowSurfaceData_GetOps(JNIEnv *env, jobject sData)
     return (GDIWinSDOps *) ops;
 }
 
-JNIEXPORT GDIWinSDOps * JNICALL
+GDIWinSDOps *
 GDIWindowSurfaceData_GetOpsNoSetup(JNIEnv *env, jobject sData)
 {
     // use the 'no setup' version of GetOps
@@ -492,7 +492,7 @@ GDIWindowSurfaceData_GetOpsNoSetup(JNIEnv *env, jobject sData)
     return (GDIWinSDOps *) ops;
 }
 
-JNIEXPORT AwtComponent * JNICALL
+AwtComponent *
 GDIWindowSurfaceData_GetComp(JNIEnv *env, GDIWinSDOps *wsdo)
 {
     PDATA pData = NULL;
@@ -524,7 +524,7 @@ GDIWindowSurfaceData_GetComp(JNIEnv *env, GDIWinSDOps *wsdo)
     return static_cast<AwtComponent*>(pData);
 }
 
-JNIEXPORT HWND JNICALL
+HWND
 GDIWindowSurfaceData_GetWindow(JNIEnv *env, GDIWinSDOps *wsdo)
 {
     HWND window = wsdo->window;
@@ -1019,7 +1019,7 @@ static HDC GDIWinSD_GetDC(JNIEnv *env, GDIWinSDOps *wsdo,
     return env->ExceptionCheck() ? (HDC)NULL : info->hDC;
 }
 
-JNIEXPORT void JNICALL
+void
 GDIWinSD_InitDC(JNIEnv *env, GDIWinSDOps *wsdo, ThreadGraphicsInfo *info,
                jint type, jint *patrop,
                jobject clip, jobject comp, jint color)
diff --git a/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.h b/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.h
index 2825d495e04..830ada43358 100644
--- a/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.h
+++ b/src/java.desktop/windows/native/libawt/java2d/windows/GDIWindowSurfaceData.h
@@ -236,21 +236,21 @@ typedef struct {
  *      is called since this function will not leave any outstanding
  *      JNI Critical locks unreleased.
  */
-JNIEXPORT GDIWinSDOps * JNICALL
+GDIWinSDOps *
 GDIWindowSurfaceData_GetOps(JNIEnv *env, jobject sData);
 
-JNIEXPORT GDIWinSDOps * JNICALL
+GDIWinSDOps *
 GDIWindowSurfaceData_GetOpsNoSetup(JNIEnv *env, jobject sData);
 
-JNIEXPORT HWND JNICALL
+HWND
 GDIWindowSurfaceData_GetWindow(JNIEnv *env, GDIWinSDOps *wsdo);
 
-JNIEXPORT void JNICALL
+void
 GDIWinSD_InitDC(JNIEnv *env, GDIWinSDOps *wsdo, ThreadGraphicsInfo *info,
                jint type, jint *patrop,
                jobject clip, jobject comp, jint color);
 
-JNIEXPORT AwtComponent * JNICALL
+AwtComponent *
 GDIWindowSurfaceData_GetComp(JNIEnv *env, GDIWinSDOps *wsdo);
 
 } /* extern "C" */
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Mlib.h b/src/java.desktop/windows/native/libawt/windows/awt_Mlib.h
index db0406245a6..55099bf3698 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Mlib.h
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Mlib.h
@@ -34,10 +34,10 @@ extern "C" {
 typedef void (*mlib_start_timer)(int);
 typedef void (*mlib_stop_timer)(int, int);
 
-JNIEXPORT mlib_status awt_getImagingLib(JNIEnv *env, mlibFnS_t *sMlibFns,
+mlib_status awt_getImagingLib(JNIEnv *env, mlibFnS_t *sMlibFns,
                                         mlibSysFnS_t *sMlibSysFns);
-JNIEXPORT mlib_start_timer awt_setMlibStartTimer();
-JNIEXPORT mlib_stop_timer awt_setMlibStopTimer();
+mlib_start_timer awt_setMlibStartTimer();
+mlib_stop_timer awt_setMlibStopTimer();
 
 #ifdef __cplusplus
 } /* end of extern "C" */