diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerInfo.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerInfo.java
index 9a6b8da8fb1..37df57e7153 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerInfo.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerInfo.java
@@ -15,6 +15,15 @@ import java.util.Map;
 
 import org.eclipse.cdt.core.parser.IExtendedScannerInfo;
 
+/**
+ * #@noextend This class is not intended to be subclassed by clients.
+ * #@noinstantiate This class is not intended to be instantiated by clients. Note
+ *     that protected constructor won't allow to instantiate this class
+ *     outside the package anyway, so it is not really API.
+ * 
+ * @deprecated Since CDT 4.0 not used for the "new style" projects.
+ */
+@Deprecated
 public class ScannerInfo implements IExtendedScannerInfo {
 
 	private final Map<String, String> fMacroMap;
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerProvider.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerProvider.java
index faeb519583a..68dca092569 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerProvider.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/resources/ScannerProvider.java
@@ -29,14 +29,22 @@ import org.eclipse.cdt.core.model.IMacroFileEntry;
 import org.eclipse.cdt.core.parser.IScannerInfo;
 import org.eclipse.cdt.core.parser.IScannerInfoChangeListener;
 import org.eclipse.cdt.core.parser.IScannerInfoProvider;
+import org.eclipse.cdt.internal.core.model.PathEntryManager;
+import org.eclipse.cdt.internal.core.settings.model.ScannerInfoProviderProxy;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
 
 /**
+ * Provides scanner information from {@link PathEntryManager}.
+ * 
  * @noextend This class is not intended to be subclassed by clients.
  * @noinstantiate This class is not intended to be instantiated by clients.
+ * 
+ * @deprecated Since CDT 4.0 replaced by {@link ScannerInfoProviderProxy}. Still
+ *     used as a default for projects created by earlier CDT versions.
  */
+@Deprecated
 public class ScannerProvider extends AbstractCExtension implements IScannerInfoProvider, IElementChangedListener {
 
 	// Listeners interested in build model changes