diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
index a2b5fa48511..0c6920b6c79 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
@@ -97,9 +97,6 @@ public class CElementImageProvider {
 		if (element instanceof ICElement) {
 			descriptor= getCImageDescriptor((ICElement) element, flags);
 		}
-//		if (descriptor == null && element instanceof ICFile) {
-//			element = ((ICFile)element).getFile();
-//		}
 		if (descriptor == null && element instanceof IAdaptable) {
 			descriptor= getWorkbenchImageDescriptor((IAdaptable) element, flags);
 		}
@@ -113,9 +110,9 @@ public class CElementImageProvider {
 		return (flags & OVERLAY_ICONS) != 0;
 	}
 	
-	private boolean useLightIcons(int flags) {
-		return (flags & LIGHT_TYPE_ICONS) != 0;
-	}
+//	private boolean useLightIcons(int flags) {
+//		return (flags & LIGHT_TYPE_ICONS) != 0;
+//	}
 	
 	private boolean useSmallSize(int flags) {
 		return (flags & SMALL_ICONS) != 0;
@@ -313,4 +310,3 @@ public class CElementImageProvider {
 	}
 	
 }
-
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionStatusDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionStatusDialog.java
index c371afac5ed..69c8cdd11d6 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionStatusDialog.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionStatusDialog.java
@@ -86,7 +86,7 @@ public abstract class SelectionStatusDialog extends SelectionDialog {
 	 * @return the first element of the initial selection.
 	 */
 	protected Object getPrimaryInitialSelection() {
-		List result= getInitialSelections();
+		List result= getInitialElementSelections();
 		if (result == null || result.size() == 0)
 			return null;
 		return result.get(0);	
@@ -124,7 +124,7 @@ public abstract class SelectionStatusDialog extends SelectionDialog {
 		fImage= image;
 	}
 	protected void setInitialSelection(int position, Object element) {
-		List l= getInitialSelections();
+		List l= getInitialElementSelections();
 		l.set(position, element);
 		fInitialSelectionSet= true;
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java
index 3630d627db5..2080cc5f831 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DocumentAdapter.java
@@ -164,7 +164,7 @@ public class DocumentAdapter implements IBuffer, IDocumentListener {
 	};
 
 	private IOpenable fOwner;
-	private IDocument fDocument;
+	IDocument fDocument;
 	private DocumentSetCommand fSetCmd= new DocumentSetCommand();
 	private DocumentReplaceCommand fReplaceCmd= new DocumentReplaceCommand();
 	
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
index 617bb176fee..0ae66b89ad3 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
@@ -579,7 +579,7 @@ public class CEditorPreferencePage extends PreferencePage implements IWorkbenchP
 		
 		
 		String label= "Text &font:";
-		addTextFontEditor(behaviorComposite, label, CEditor.PREFERENCE_FONT);
+		addTextFontEditor(behaviorComposite, label, JFaceResources.TEXT_FONT);
 		
 		label= "Displayed &tab width:";
 		addTextField(behaviorComposite, label, CSourceViewerConfiguration.PREFERENCE_TAB_WIDTH, 2, 0, true);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
index 851b89ee692..be90c42868f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
@@ -9,7 +9,6 @@ import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.internal.ui.BuildConsoleManager;