diff --git a/icu4c/source/common/ucnv2022.c b/icu4c/source/common/ucnv2022.c
index 54806b843d2..e52b4c649bc 100644
--- a/icu4c/source/common/ucnv2022.c
+++ b/icu4c/source/common/ucnv2022.c
@@ -3571,7 +3571,7 @@ getTrail:
                     }
                     if(targetUniChar==missingCharMarker){
                         iterCount = (iterCount<3)? iterCount+1 : 0;
-                        myConverterData->fromUnicodeCurrentState=currentState=(StateEnumCN)(currentState<3)? currentState+1:0;
+                        myConverterData->fromUnicodeCurrentState=currentState=(StateEnum)(currentState<3)? currentState+1:0;
                         currentState =(StateEnumCN) myConverterData->fromUnicodeCurrentState;
                         myConverterData->fromUnicodeConverter = (myConverterData->fromUnicodeConverter == NULL) ?
                                                         myConverterData->myConverterArray[0] :
@@ -3873,7 +3873,7 @@ getTrail:
                     }
                     if(targetUniChar==missingCharMarker){
                         iterCount = (iterCount<3)? iterCount+1 : 0;
-                        myConverterData->fromUnicodeCurrentState=currentState=(StateEnumCN)(currentState<3)? currentState+1:0;
+                        myConverterData->fromUnicodeCurrentState=currentState=(StateEnum)(currentState<3)? currentState+1:0;
                         currentState =(StateEnumCN) myConverterData->fromUnicodeCurrentState;
                         myConverterData->fromUnicodeConverter = (myConverterData->fromUnicodeConverter == NULL) ?
                                                         myConverterData->myConverterArray[0] :
diff --git a/icu4c/source/common/ucnvhz.c b/icu4c/source/common/ucnvhz.c
index f35cb220543..6e2b2324cba 100644
--- a/icu4c/source/common/ucnvhz.c
+++ b/icu4c/source/common/ucnvhz.c
@@ -588,7 +588,7 @@ static void concatEscape(UConverterFromUnicodeArgs* args, int32_t *targetIndex,
 }
 
 static void concatString(UConverterFromUnicodeArgs* args, int32_t *targetIndex, int32_t *targetLength,
-                         const	UChar32* strToAppend,UErrorCode* err, int32_t *sourceIndex){
+                         const	uint32_t* strToAppend,UErrorCode* err, int32_t *sourceIndex){
     
     if(*strToAppend < 0x00FF){
         if( (*targetIndex)+1 >= *targetLength){