diff --git a/jdk/make/non-build-utils/sharing/classlist.aix b/jdk/make/data/classlist/classlist.aix
similarity index 100%
rename from jdk/make/non-build-utils/sharing/classlist.aix
rename to jdk/make/data/classlist/classlist.aix
diff --git a/jdk/make/lib/NioLibraries.gmk b/jdk/make/lib/NioLibraries.gmk
index 9cf07fe2334..5c648c2dbe6 100644
--- a/jdk/make/lib/NioLibraries.gmk
+++ b/jdk/make/lib/NioLibraries.gmk
@@ -113,7 +113,7 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), aix)
-  BUILD_LIBNIO_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
+  BUILD_LIBNIO_MAPFILE:=$(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
   BUILD_LIBNIO_SRC += \
       $(JDK_TOPDIR)/src/aix/native/sun/nio/ch \
       $(JDK_TOPDIR)/src/aix/native/sun/nio/fs