diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
index ae025cdc7e26..3eaca719e971 100644
--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
@@ -165,6 +165,16 @@ ifeq ($(call isTargetOs, windows), true)
   LIBAWT_CFLAGS += $(A11Y_JAWS_ANNOUNCING_CFLAGS)
 endif
 
+# Setup speech-dispatcher a11y announcer for Linux XAWT/WLAWT
+A11Y_SPEECHD_ANNOUNCING_CFLAGS := -DNO_A11Y_SPEECHD_ANNOUNCING
+ifeq ($(call isTargetOs, linux), true)
+  A11Y_SPEECHD_ANNOUNCING_CFLAGS := $(SPEECHD_CFLAGS) -DNO_A11Y_SPEECHD_ANNOUNCING
+
+  ifeq ($(A11Y_SPEECHD_ANNOUNCING_ENABLED), true)
+    A11Y_SPEECHD_ANNOUNCING_CFLAGS := $(SPEECHD_CFLAGS)
+  endif
+endif
+
 # Setup Vulkan
 ifeq ($(VULKAN_ENABLED), true)
   LIBAWT_EXTRA_SRC += common/font common/java2d/vulkan
@@ -278,20 +288,9 @@ ifeq ($(call isTargetOs, windows macosx), false)
         common/awt \
         common/java2d \
         common/font \
+        common/accessibility/AccessibleAnnouncer \
         #
 
-    ifeq ($(A11Y_SPEECHD_ANNOUNCING_ENABLED), true)
-        A11Y_SPEECHD_ANNOUNCING_CFLAGS :=
-    else
-        A11Y_SPEECHD_ANNOUNCING_CFLAGS := -DNO_A11Y_SPEECHD_ANNOUNCING
-    endif
-
-    ifeq ($(call isTargetOs, linux), true)
-        LIBAWT_XAWT_EXTRA_SRC += \
-            $(TOPDIR)/src/$(MODULE)/linux/native/libawt_xawt \
-            #
-    endif
-
     LIBAWT_XAWT_EXCLUDES := medialib debug wl $(VULKAN_EXCLUDES)
 
     LIBPIPEWIRE_HEADER_DIRS := \
@@ -315,7 +314,6 @@ ifeq ($(call isTargetOs, windows macosx), false)
     LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
         $(FONTCONFIG_CFLAGS) \
         $(CUPS_CFLAGS) \
-        $(SPEECHD_CFLAGS) \
         $(A11Y_SPEECHD_ANNOUNCING_CFLAGS) \
         #
 
@@ -396,6 +394,7 @@ ifeq ($(call isTargetOs, windows macosx), false)
         common/java2d \
         common/font \
         common/wayland \
+        common/accessibility/AccessibleAnnouncer \
         #
 
     LIBAWT_WLAWT_EXCLUDES := medialib debug opengl x11 $(VULKAN_EXCLUDES)
@@ -423,7 +422,8 @@ ifeq ($(call isTargetOs, windows macosx), false)
         $(WAKEFIELD_ROBOT_CFLAGS) \
         $(FONTCONFIG_CFLAGS) \
         $(VULKAN_FLAGS) \
-        $(CUPS_CFLAGS)
+        $(CUPS_CFLAGS) \
+        $(A11Y_SPEECHD_ANNOUNCING_CFLAGS)
 
     LIBAWT_WLAWT_LIBS := $(LIBM) -lawt $(WAYLAND_LIBS) $(LIBDL) -ljava -ljvm -lrt
 
diff --git a/src/java.desktop/linux/native/libawt_xawt/AccessibleAnnouncer/AccessibleAnnouncer.c b/src/java.desktop/unix/native/common/accessibility/AccessibleAnnouncer/AccessibleAnnouncer.c
similarity index 100%
rename from src/java.desktop/linux/native/libawt_xawt/AccessibleAnnouncer/AccessibleAnnouncer.c
rename to src/java.desktop/unix/native/common/accessibility/AccessibleAnnouncer/AccessibleAnnouncer.c
diff --git a/src/java.desktop/linux/native/libawt_xawt/AccessibleAnnouncer/AccessibleAnnouncerJNIUtils.h b/src/java.desktop/unix/native/common/accessibility/AccessibleAnnouncer/AccessibleAnnouncerJNIUtils.h
similarity index 100%
rename from src/java.desktop/linux/native/libawt_xawt/AccessibleAnnouncer/AccessibleAnnouncerJNIUtils.h
rename to src/java.desktop/unix/native/common/accessibility/AccessibleAnnouncer/AccessibleAnnouncerJNIUtils.h
diff --git a/src/java.desktop/linux/native/libawt_xawt/AccessibleAnnouncer/OrcaAnnouncer.c b/src/java.desktop/unix/native/common/accessibility/AccessibleAnnouncer/OrcaAnnouncer.c
similarity index 100%
rename from src/java.desktop/linux/native/libawt_xawt/AccessibleAnnouncer/OrcaAnnouncer.c
rename to src/java.desktop/unix/native/common/accessibility/AccessibleAnnouncer/OrcaAnnouncer.c
diff --git a/src/java.desktop/linux/native/libawt_xawt/AccessibleAnnouncer/OrcaAnnouncer.h b/src/java.desktop/unix/native/common/accessibility/AccessibleAnnouncer/OrcaAnnouncer.h
similarity index 100%
rename from src/java.desktop/linux/native/libawt_xawt/AccessibleAnnouncer/OrcaAnnouncer.h
rename to src/java.desktop/unix/native/common/accessibility/AccessibleAnnouncer/OrcaAnnouncer.h
diff --git a/src/java.desktop/linux/native/libawt_xawt/AccessibleAnnouncer/libspeechd_dyn.c b/src/java.desktop/unix/native/common/accessibility/AccessibleAnnouncer/libspeechd_dyn.c
similarity index 100%
rename from src/java.desktop/linux/native/libawt_xawt/AccessibleAnnouncer/libspeechd_dyn.c
rename to src/java.desktop/unix/native/common/accessibility/AccessibleAnnouncer/libspeechd_dyn.c