diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 491cf5a707c..94348d56a6c 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -10,6 +10,7 @@ C_SRCS = \
 	actctx.c \
 	atom.c \
 	cdrom.c \
+	combclass.c \
 	critsection.c \
 	crypt.c \
 	debugbuffer.c \
diff --git a/libs/port/combclass.c b/dlls/ntdll/combclass.c
similarity index 100%
rename from libs/port/combclass.c
rename to dlls/ntdll/combclass.c
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index f9e45035bd6..3b70f82d6fe 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -76,7 +76,6 @@ C_SRCS = \
 	c_950.c \
 	casemap.c \
 	collation.c \
-	combclass.c \
 	compose.c \
 	cpsymbol.c \
 	cptable.c \
diff --git a/tools/make_unicode b/tools/make_unicode
index c500e68ee9f..3f1d3e55a97 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -2757,7 +2757,7 @@ dump_bidi_dir_table( "dlls/dwrite/direction.c" );
 dump_string_type_table( "dlls/kernelbase/wctype.c" );
 dump_digit_folding( "libs/port/digitmap.c", 1 );
 dump_digit_folding( "dlls/kernelbase/digitmap.c", 0 );
-dump_combining_class( "libs/port/combclass.c" );
+dump_combining_class( "dlls/ntdll/combclass.c" );
 dump_mirroring( "dlls/usp10/mirror.c" );
 dump_mirroring( "dlls/dwrite/mirror.c" );
 dump_bracket( "dlls/usp10/bracket.c" );