diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/APathEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/APathEntry.java
index c70d64049fd..5e7350b6b31 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/APathEntry.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/APathEntry.java
@@ -25,7 +25,11 @@ public abstract class APathEntry extends PathEntry {
 	public APathEntry (int kind, IPath path, IPath basePath, IPath[] exclusionPatterns, boolean isExported) {
 		super(kind, path, isExported);
 		this.basePath = basePath;
-		this.exclusionPatterns = exclusionPatterns;
+		if (exclusionPatterns == null) {
+			this.exclusionPatterns = NO_EXCLUSION_PATTERNS;
+		} else {
+			this.exclusionPatterns = exclusionPatterns;
+		}
 	}
 
 	/**
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainer.java
index d3315cae59c..945ed1ccae8 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainer.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainer.java
@@ -249,7 +249,7 @@ public class CContainer extends Openable implements ICContainer {
 					break;
 				}
 			case IResource.FOLDER :
-				celement = new CContainer(this, (IFolder) resource);
+				celement = new CContainer(this, resource);
 				break;
 		}
 		return celement;
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java
index 336a76750b8..5c5d32ed976 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CContainerInfo.java
@@ -53,7 +53,6 @@ public class CContainerInfo extends OpenableInfo {
 
 			IPathEntry[] entries = cproject.getResolvedPathEntries();
 			if (resources != null) {
-				CModelManager factory = CModelManager.getDefault();
 				ICElement[] children = getChildren();
 				for (int i = 0; i < resources.length; i++) {
 					boolean found = false;
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java
index 973504626d4..cf4eb99e71a 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java
@@ -88,7 +88,6 @@ public class IncludeReference extends Openable implements IIncludeReference {
 	 */
 	protected boolean computeChildren(OpenableInfo info, IResource res) throws CModelException {
 			ArrayList vChildren = new ArrayList();
-			final CModelManager factory = CModelManager.getDefault();
 			File file = null;
 			if (fPath != null) {
 				file = fPath.toFile();
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
index 13d81153fdb..c85ee91a680 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
@@ -508,8 +508,6 @@ public class PathEntryManager implements ICDescriptorListener {
 
 	public ICElementDelta[] generatePathEntryDeltas(ICProject cproject, IPathEntry[] oldEntries, IPathEntry[] newEntries) {
 		ArrayList list = new ArrayList();
-		CModelManager manager = CModelManager.getDefault();
-		boolean hasDelta = false;
 
 		// Sanity checks
 		if (oldEntries == null) {
@@ -591,7 +589,6 @@ public class PathEntryManager implements ICDescriptorListener {
 					break;
 				}
 				case IPathEntry.CDT_LIBRARY: {
-					ILibraryEntry lib = (ILibraryEntry) entry;
 					celement = cproject;
 					flag = (removed) ? ICElementDelta.F_REMOVED_PATHENTRY_LIBRARY : ICElementDelta.F_ADDED_PATHENTRY_LIBRARY;
 					break;
@@ -669,7 +666,7 @@ public class PathEntryManager implements ICDescriptorListener {
 		}
 
 		// ensure path is absolute
-		boolean hasPath = element.hasAttribute(ATTRIBUTE_PATH);
+		//boolean hasPath = element.hasAttribute(ATTRIBUTE_PATH);
 		String pathAttr = element.getAttribute(ATTRIBUTE_PATH);
 		IPath path = new Path(pathAttr);
 		if (!path.isAbsolute()) {
@@ -849,7 +846,6 @@ public class PathEntryManager implements ICDescriptorListener {
 	 * @see org.eclipse.cdt.core.ICDescriptorListener#descriptorChanged(org.eclipse.cdt.core.CDescriptorEvent)
 	 */
 	public void descriptorChanged(CDescriptorEvent event) {
-		int flags = event.getFlags();
 		if (event.getType() == CDescriptorEvent.CDTPROJECT_CHANGED) {
 			ICDescriptor cdesc = event.getDescriptor();
 			if (cdesc != null) {