diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
index e285e90a3..eee8254de 100644
--- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
+++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
@@ -551,7 +551,7 @@ public final class SimpleLanguageServer implements Sts4LanguageServer, LanguageC
 			IProblemCollector problems = new IProblemCollector() {
 
 				private LinkedHashSet<Diagnostic> diagnostics = new LinkedHashSet<>();
-				private List<Quickfix> quickfixes = new ArrayList<>();
+				private List<Quickfix<?>> quickfixes = new ArrayList<>();
 
 				@Override
 				public void endCollecting() {
diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java
index 5a49d93bd..e2edce5a7 100644
--- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java
+++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java
@@ -473,7 +473,7 @@ public class SimpleTextDocumentService implements TextDocumentService, DocumentE
 		}
 	}
 
-	public void setQuickfixes(TextDocumentIdentifier docId, List<Quickfix> quickfixes) {
+	public void setQuickfixes(TextDocumentIdentifier docId, List<Quickfix<?>> quickfixes) {
 		TrackedDocument td = documents.get(docId.getUri());
 		if (td!=null) {
 			td.setQuickfixes(quickfixes);
diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/TrackedDocument.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/TrackedDocument.java
index 49c9ded86..35b3b2ad8 100644
--- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/TrackedDocument.java
+++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/TrackedDocument.java
@@ -20,7 +20,7 @@ import com.google.common.collect.ImmutableList;
 public class TrackedDocument {
 
 	private final TextDocument doc;
-	private List<Quickfix> quickfixes = ImmutableList.of();
+	private List<Quickfix<?>> quickfixes = ImmutableList.of();
 	private int openCount = 0;
 
 	public TrackedDocument(TextDocument doc) {
@@ -31,11 +31,11 @@ public class TrackedDocument {
 		return doc;
 	}
 
-	public void setQuickfixes(List<Quickfix> quickfixes) {
+	public void setQuickfixes(List<Quickfix<?>> quickfixes) {
 		this.quickfixes = quickfixes;
 	}
 
-	public List<Quickfix> getQuickfixes() {
+	public List<Quickfix<?>> getQuickfixes() {
 		return quickfixes;
 	}