diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
index cbec032d2da..c62c72cfc06 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
@@ -129,8 +129,10 @@ private val MODIFIERS_TO_REPLACE = mapOf(
         PROTECTED_KEYWORD to listOf(PUBLIC_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD),
         PRIVATE_KEYWORD to listOf(PUBLIC_KEYWORD, PROTECTED_KEYWORD, INTERNAL_KEYWORD),
         INTERNAL_KEYWORD to listOf(PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD),
-        HEADER_KEYWORD to listOf(IMPL_KEYWORD),
-        IMPL_KEYWORD to listOf(HEADER_KEYWORD)
+        HEADER_KEYWORD to listOf(IMPL_KEYWORD, ACTUAL_KEYWORD),
+        IMPL_KEYWORD to listOf(HEADER_KEYWORD, EXPECT_KEYWORD),
+        EXPECT_KEYWORD to listOf(IMPL_KEYWORD, ACTUAL_KEYWORD),
+        ACTUAL_KEYWORD to listOf(HEADER_KEYWORD, EXPECT_KEYWORD)
 )
 
 private val MODIFIERS_ORDER = listOf(PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD,