--- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/model/BSFModelFactory.java	Thu Jul 09 14:26:36 2009 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/model/BSFModelFactory.java	Fri Jul 10 11:47:48 2009 -0500
@@ -17,12 +17,17 @@
 
 package com.nokia.carbide.cpp.epoc.engine.model;
 
+import com.nokia.carbide.cpp.epoc.engine.EpocEnginePlugin;
 import com.nokia.carbide.cpp.epoc.engine.model.bsf.IBSFOwnedModel;
 import com.nokia.carbide.internal.cpp.epoc.engine.model.bsf.BSFModel;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jface.text.IDocument;
 
+/**
+ * This class is an internal implementation and will be moved to an internal package.
+ * @deprecated Use {@link EpocEnginePlugin#getBSFModelProvider()} 
+ */
 public class BSFModelFactory implements IModelFactory<IBSFOwnedModel> {
 
 	/* (non-Javadoc)

--- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/model/ImageMakefileModelFactory.java	Thu Jul 09 14:26:36 2009 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/model/ImageMakefileModelFactory.java	Fri Jul 10 11:47:48 2009 -0500
@@ -17,6 +17,7 @@
 
 package com.nokia.carbide.cpp.epoc.engine.model;
 
+import com.nokia.carbide.cpp.epoc.engine.EpocEnginePlugin;
 import com.nokia.carbide.cpp.epoc.engine.model.makefile.image.IImageMakefileOwnedModel;
 import com.nokia.carbide.internal.cpp.epoc.engine.model.makefile.image.ImageMakefileModel;
 
@@ -24,8 +25,8 @@
 import org.eclipse.jface.text.IDocument;
 
 /**
- * Model for creating image makefiles.
- *
+ * This class is an internal implementation and will be moved to an internal package.
+ * @deprecated Use {@link EpocEnginePlugin#getImageMakefileModelProvider()}
  */
 public class ImageMakefileModelFactory implements IModelFactory<IImageMakefileOwnedModel> {
 

--- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/model/MakefileModelFactory.java	Thu Jul 09 14:26:36 2009 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/model/MakefileModelFactory.java	Fri Jul 10 11:47:48 2009 -0500
@@ -17,12 +17,17 @@
 
 package com.nokia.carbide.cpp.epoc.engine.model;
 
+import com.nokia.carbide.cpp.epoc.engine.EpocEnginePlugin;
 import com.nokia.carbide.cpp.epoc.engine.model.makefile.IMakefileOwnedModel;
 import com.nokia.carbide.internal.cpp.epoc.engine.model.makefile.MakefileModel;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jface.text.IDocument;
 
+/**
+ * This class is an internal implementation and will be moved to an internal package.
+ * @deprecated Use {@link EpocEnginePlugin#getMakefileModelProvider()}
+ */
 public class MakefileModelFactory implements IModelFactory<IMakefileOwnedModel> {
 
 	/* (non-Javadoc)

--- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/model/PKGModelFactory.java	Thu Jul 09 14:26:36 2009 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/model/PKGModelFactory.java	Fri Jul 10 11:47:48 2009 -0500
@@ -20,11 +20,16 @@
 
 import com.nokia.carbide.cpp.epoc.engine.EpocEnginePlugin;
 import com.nokia.carbide.internal.api.cpp.epoc.engine.model.pkg.IPKGOwnedModel;
+import com.nokia.carbide.internal.api.cpp.epoc.engine.model.pkg.PKGModelHelper;
 import com.nokia.carbide.internal.cpp.epoc.engine.model.pkg.PKGModel;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jface.text.IDocument;
 
+/**
+ * This class is an internal implementation and will be moved to an internal package.
+ * @deprecated Use {@link PKGModelHelper#getPKGModelProvider()} when made into API
+ */
 public class PKGModelFactory  implements IModelFactory<IPKGOwnedModel> {
 
 	public IPKGOwnedModel createModel(IPath path, IDocument document) {