diff --git a/icu4c/source/common/ucnv_bld.h b/icu4c/source/common/ucnv_bld.h
index 7cc2ea1100b..a5e2acf8312 100644
--- a/icu4c/source/common/ucnv_bld.h
+++ b/icu4c/source/common/ucnv_bld.h
@@ -27,12 +27,18 @@
 #define UCNV_BLD_H
 
 #include "utypes.h"
-#include "ucmp8.h"
-#include "ucmp16.h"
 
 #define UCNV_MAX_SUBCHAR_LEN 4
 #define UCNV_ERROR_BUFFER_LENGTH 20
 
+#ifndef UCMP16_H
+typedef struct _CompactShortArray CompactShortArray;
+#endif
+
+#ifndef UCMP8_H
+typedef struct _CompactByteArray CompactByteArray;
+#endif
+
 #define UCNV_IMPLEMENTED_CONVERSION_TYPES 9
 /*Sentinel Value used to check the integrity of the binary data files */
 
diff --git a/icu4c/source/common/ucnv_imp.h b/icu4c/source/common/ucnv_imp.h
index 89adf4716fd..619c92b7a72 100644
--- a/icu4c/source/common/ucnv_imp.h
+++ b/icu4c/source/common/ucnv_imp.h
@@ -27,7 +27,10 @@
 #define UCNV_IMP_H
 
 #include "utypes.h"
-#include "uhash.h"
+
+#ifndef UHASH_H
+typedef struct _UHashtable UHashtable;
+#endif
 
 /*Hashtable used to store UConverterSharedData objects supporting
  *the Caching mechanism