diff --git a/resources/src/componentSets/InspectionComponents.xml b/resources/src/componentSets/InspectionComponents.xml
index 3d6b3f2d1e2e..6783c5c22655 100644
--- a/resources/src/componentSets/InspectionComponents.xml
+++ b/resources/src/componentSets/InspectionComponents.xml
@@ -17,6 +17,10 @@
     <component>
       <implementation-class>com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings</implementation-class>
     </component>
+    <component>
+      <interface-class>com.intellij.openapi.projectRoots.JavaSdk</interface-class>
+      <implementation-class>com.intellij.openapi.projectRoots.impl.JavaSdkImpl</implementation-class>
+    </component>
   </application-components>
 
   <module-components>
@@ -24,6 +28,11 @@
       <interface-class>com.intellij.openapi.vcs.ModuleLevelVcsManager</interface-class>
       <implementation-class>com.intellij.openapi.vcs.impl.ModuleLevelVcsManagerImpl</implementation-class>
     </component>
+    <component>
+      <interface-class>com.intellij.openapi.vcs.impl.VcsManagerPerModuleConfiguration</interface-class>
+      <implementation-class>com.intellij.openapi.vcs.impl.VcsManagerPerModuleConfiguration</implementation-class>
+      <option name="workspace" value="true"/>
+    </component>
   </module-components>
   <include name="componentSets/ErrorReport"/>
 </components>
\ No newline at end of file