diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileContentOutlinePage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileContentOutlinePage.java
index 77b943976c3..020677b4b4e 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileContentOutlinePage.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileContentOutlinePage.java
@@ -37,7 +37,6 @@ import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -51,12 +50,11 @@ import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.part.IPageSite;
 import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 
 /**
  * MakefileContentOutlinePage
  */
-public class MakefileContentOutlinePage extends ContentOutlinePage implements IContentOutlinePage {
+public class MakefileContentOutlinePage extends ContentOutlinePage {
 
 	private class MakefileContentProvider implements ITreeContentProvider {
 
@@ -126,7 +124,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage implements IC
 			} else {
 				directives = new IDirective[0];
 			}
-			List list = new ArrayList(directives.length);
+			List<IDirective> list = new ArrayList<IDirective>(directives.length);
 			for (int i = 0; i < directives.length; i++) {
 				if (showMacroDefinition && directives[i] instanceof IMacroDefinition) {
 					list.add(directives[i]);
@@ -171,7 +169,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage implements IC
 
 	}
 
-	private class MakefileLabelProvider extends LabelProvider implements ILabelProvider {
+	private class MakefileLabelProvider extends LabelProvider {
 
 		/* (non-Javadoc)
 		* @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/OpenIncludeAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/OpenIncludeAction.java
index 91842c0981b..fd2ad619d6f 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/OpenIncludeAction.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/OpenIncludeAction.java
@@ -107,16 +107,17 @@ public class OpenIncludeAction extends Action {
 
 	IInclude[] getIncludeDirective(ISelection sel) {
 		if (!sel.isEmpty() && sel instanceof IStructuredSelection) {
-			List list= ((IStructuredSelection)sel).toList();
+			@SuppressWarnings("unchecked")
+			List<Object> list= ((IStructuredSelection)sel).toList();
 			if (list.size() > 0) {
-				List includes = new ArrayList(list.size());
+				List<IInclude> includes = new ArrayList<IInclude>(list.size());
 				for (int i = 0; i < list.size(); ++i) {
 					Object element= list.get(i);
 					if (element instanceof IInclude) {
-						includes.add(element);
+						includes.add((IInclude) element);
 					}
 				}
-				return (IInclude[]) includes.toArray(new IInclude[includes.size()]);
+				return includes.toArray(new IInclude[includes.size()]);
 			}
 		}
 		return null;