diff --git a/platform/lang-api/src/com/intellij/codeInsight/editorActions/SmartBackspaceMode.java b/platform/analysis-api/src/com/intellij/codeInsight/editorActions/SmartBackspaceMode.java
similarity index 100%
rename from platform/lang-api/src/com/intellij/codeInsight/editorActions/SmartBackspaceMode.java
rename to platform/analysis-api/src/com/intellij/codeInsight/editorActions/SmartBackspaceMode.java
diff --git a/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml b/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml
index 372e219c2a58..7b1b8244cb4d 100644
--- a/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml
+++ b/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml
@@ -16,5 +16,6 @@
                             order="last"/>
     <applicationService serviceInterface="com.intellij.psi.stubs.SerializationManager"
                         serviceImplementation="com.intellij.psi.stubs.SerializationManagerImpl" preload="true"/>
+    <applicationService serviceImplementation="com.intellij.codeInsight.CodeInsightSettings"/>
   </extensions>
 </idea-plugin>
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java b/platform/analysis-impl/src/com/intellij/codeInsight/CodeInsightSettings.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java
rename to platform/analysis-impl/src/com/intellij/codeInsight/CodeInsightSettings.java
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CamelHumpMatcher.java b/platform/analysis-impl/src/com/intellij/codeInsight/completion/impl/CamelHumpMatcher.java
similarity index 97%
rename from platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CamelHumpMatcher.java
rename to platform/analysis-impl/src/com/intellij/codeInsight/completion/impl/CamelHumpMatcher.java
index 77df8c87af87..8cc0281f8914 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CamelHumpMatcher.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/completion/impl/CamelHumpMatcher.java
@@ -14,6 +14,7 @@ import com.intellij.psi.codeStyle.MinusculeMatcher;
 import com.intellij.psi.codeStyle.NameUtil;
 import com.intellij.util.containers.FList;
 import com.intellij.util.text.CharArrayUtil;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
@@ -37,7 +38,8 @@ public class CamelHumpMatcher extends PrefixMatcher {
     this(prefix, caseSensitive, false);
   }
 
-  CamelHumpMatcher(String prefix, boolean caseSensitive, boolean typoTolerant) {
+  @ApiStatus.Internal
+  public CamelHumpMatcher(String prefix, boolean caseSensitive, boolean typoTolerant) {
     super(prefix);
     myCaseSensitive = caseSensitive;
     myTypoTolerant = typoTolerant;
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index 591c82a78279..a955a51c5c19 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -131,7 +131,6 @@
     <projectService serviceInterface="com.intellij.find.FindInProjectSettings" serviceImplementation="com.intellij.find.impl.FindInProjectRecents"/>
     <pathMacroFilter implementation="com.intellij.find.impl.FindInProjectSettingsBase$FindInProjectPathMacroFilter"/>
 
-    <applicationService serviceImplementation="com.intellij.codeInsight.CodeInsightSettings"/>
     <projectService serviceImplementation="com.intellij.codeInsight.CodeInsightWorkspaceSettings"/>
 
     <applicationService serviceInterface="com.intellij.openapi.roots.impl.libraries.ApplicationLibraryTable"