diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditor.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditor.java
index 670753a0fd9..11be9d797df 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditor.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditor.java
@@ -186,18 +186,18 @@ public class MakefileEditor extends TextEditor implements ISelectionChangedListe
 		return viewer;
 	}
 
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings("unchecked")
 	@Override
-	public Object getAdapter(Class key) {
+	public <T> T getAdapter(Class<T> key) {
 		if (ProjectionAnnotationModel.class.equals(key)) {
 			if (projectionSupport != null) {
-				Object result = projectionSupport.getAdapter(getSourceViewer(), key);
+				T result = projectionSupport.getAdapter(getSourceViewer(), key);
 				if (result != null) {
 					return result;
 				}
 			}
 		} else if (key.equals(IContentOutlinePage.class)) {
-			return getOutlinePage();
+			return (T) getOutlinePage();
 		}
 		return super.getAdapter(key);
 	}
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/ProjectionMakefileUpdater.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/ProjectionMakefileUpdater.java
index e0cbf566bf5..ab6426db830 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/ProjectionMakefileUpdater.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/ProjectionMakefileUpdater.java
@@ -145,7 +145,7 @@ public class ProjectionMakefileUpdater implements IProjectionListener {
 			fInput= manager.getWorkingCopy(fEditor.getEditorInput());
 
 			if (fInput != null) {
-				ProjectionAnnotationModel model= (ProjectionAnnotationModel) fEditor.getAdapter(ProjectionAnnotationModel.class);
+				ProjectionAnnotationModel model= fEditor.getAdapter(ProjectionAnnotationModel.class);
 				if (model != null) {
 					Map<MakefileProjectionAnnotation, Position> additions= computeAdditions((IParent) fInput);
 					model.removeAllAnnotations();
@@ -229,7 +229,7 @@ public class ProjectionMakefileUpdater implements IProjectionListener {
 			return;
 		}
 
-		ProjectionAnnotationModel model= (ProjectionAnnotationModel) fEditor.getAdapter(ProjectionAnnotationModel.class);
+		ProjectionAnnotationModel model= fEditor.getAdapter(ProjectionAnnotationModel.class);
 		if (model == null) {
 			return;
 		}
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/SharedPart.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/SharedPart.java
index e153c5311cb..9aafa591d85 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/SharedPart.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/SharedPart.java
@@ -14,10 +14,6 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 
-/**
- * @version 	1.0
- * @author
- */
 public abstract class SharedPart {
 	private boolean enabled = true;
 
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/SharedPartWithButtons.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/SharedPartWithButtons.java
index f8b1d4b575a..fad5ec42204 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/SharedPartWithButtons.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/SharedPartWithButtons.java
@@ -19,10 +19,6 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
-/**
- * @version 	1.0
- * @author
- */
 public abstract class SharedPartWithButtons extends SharedPart {
 	private String[] buttonLabels;
 	private Control[] controls;
@@ -58,9 +54,6 @@ public abstract class SharedPartWithButtons extends SharedPart {
 	protected abstract void createMainControl(Composite parent, int style, int span);
 	protected abstract void buttonSelected(Button button, int index);
 
-	/*
-	 * @see SharedPart#createControl(Composite, FormWidgetFactory)
-	 */
 	@Override
 	public void createControl(Composite parent, int style, int span) {
 		createMainLabel(parent, span);
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/StructuredViewerPart.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/StructuredViewerPart.java
index 3ab15785bf7..f28dcd8fab5 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/StructuredViewerPart.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/StructuredViewerPart.java
@@ -15,10 +15,7 @@ import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-/**
- * @version 	1.0
- * @author
- */
+
 public abstract class StructuredViewerPart extends SharedPartWithButtons {
 	private StructuredViewer viewer;
 	private Point minSize = null;
@@ -35,9 +32,6 @@ public abstract class StructuredViewerPart extends SharedPartWithButtons {
 		return viewer.getControl();
 	}
 
-	/*
-	 * @see SharedPartWithButtons#createMainControl(Composite, int, FormWidgetFactory)
-	 */
 	@Override
 	protected void createMainControl(Composite parent, int style, int span) {
 		viewer = createStructuredViewer(parent, style);