diff --git a/source/common/ucnv_bld.h b/source/common/ucnv_bld.h
index ec11d82c86f..7cc2ea1100b 100644
--- a/source/common/ucnv_bld.h
+++ b/source/common/ucnv_bld.h
@@ -27,13 +27,12 @@
 #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
 
-typedef struct CompactShortArray CompactShortArray;
-typedef struct CompactByteArray CompactByteArray;
-
 #define UCNV_IMPLEMENTED_CONVERSION_TYPES 9
 /*Sentinel Value used to check the integrity of the binary data files */
 
diff --git a/source/common/ucnv_imp.h b/source/common/ucnv_imp.h
index 9360f7a61ff..89adf4716fd 100644
--- a/source/common/ucnv_imp.h
+++ b/source/common/ucnv_imp.h
@@ -27,8 +27,7 @@
 #define UCNV_IMP_H
 
 #include "utypes.h"
-
-typedef struct UHashtable UHashtable;
+#include "uhash.h"
 
 /*Hashtable used to store UConverterSharedData objects supporting
  *the Caching mechanism