diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java
index a0cd9feb1a6..e12f991b713 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java
@@ -177,7 +177,7 @@ public class CustomFiltersDialog extends SelectionDialog {
 		fCheckBoxList.getTable().setLayoutData(data);
 
 		fCheckBoxList.setLabelProvider(createLabelPrivder());
-		fCheckBoxList.setContentProvider(new ArrayContentProvider());
+		fCheckBoxList.setContentProvider(ArrayContentProvider.getInstance());
 
 		fCheckBoxList.setInput(fBuiltInFilters);
 		setInitialSelections(getEnabledFilterDescriptors());
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java
index 9648d2a86a2..b58eeaa1ee1 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java
@@ -426,7 +426,7 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
 			}
 		});
 		tableProvidersViewer = new CheckboxTableViewer(tableProviders);
-		tableProvidersViewer.setContentProvider(new ArrayContentProvider());
+		tableProvidersViewer.setContentProvider(ArrayContentProvider.getInstance());
 		tableProvidersViewer.setLabelProvider(new ProvidersTableLabelProvider());
 
 		tableProvidersViewer.addCheckStateListener(new ICheckStateListener() {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java
index 7619911058e..600c241d0f3 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java
@@ -454,7 +454,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
 			}
 		});
 		
-		fDefaultViewer.setContentProvider(new ArrayContentProvider());
+		fDefaultViewer.setContentProvider(ArrayContentProvider.getInstance());
 		
 		DefaultTableLabelProvider labelProvider= new DefaultTableLabelProvider();
 		fDefaultViewer.setLabelProvider(labelProvider);
@@ -526,7 +526,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
 		nameColumn.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_separate_table_category_column_title);
 		nameColumn.setResizable(false);
 		
-		fSeparateViewer.setContentProvider(new ArrayContentProvider());
+		fSeparateViewer.setContentProvider(ArrayContentProvider.getInstance());
 		
 		ITableLabelProvider labelProvider= new SeparateTableLabelProvider();
 		fSeparateViewer.setLabelProvider(labelProvider);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java
index 5b0869396ec..f690ce82e8c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java
@@ -264,7 +264,7 @@ public class WhiteSpaceTabPage extends FormatterTabPage {
 			fInnerViewer.getControl().setLayoutData(innerGd);
 			
 			fOptionsViewer= CheckboxTableViewer.newCheckList(sashForm, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL);
-			fOptionsViewer.setContentProvider(new ArrayContentProvider());
+			fOptionsViewer.setContentProvider(ArrayContentProvider.getInstance());
 			fOptionsViewer.setLabelProvider(new LabelProvider());
 			
 			final GridData optionsGd= createGridData(numColumns, GridData.HORIZONTAL_ALIGN_FILL | GridData.FILL_VERTICAL, SWT.DEFAULT);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringSaveHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringSaveHelper.java
index f617a3d9547..167c07f18d3 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringSaveHelper.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/RefactoringSaveHelper.java
@@ -204,7 +204,7 @@ public class RefactoringSaveHelper {
 		dialog.setTitle(Messages.RefactoringSaveHelper_save_all_resources);
 		dialog.setLabelProvider(createDialogLabelProvider());
 		dialog.setMessage(Messages.RefactoringSaveHelper_must_save);
-		dialog.setContentProvider(new ArrayContentProvider());
+		dialog.setContentProvider(ArrayContentProvider.getInstance());
 		dialog.setInput(Arrays.asList(dirtyEditors));
 		return dialog.open() == Window.OK;
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java
index b3953ac2777..cf90b6d76c4 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java
@@ -332,7 +332,7 @@ public final class RegexErrorParserOptionPage extends AbstractCOptionPage {
 
 		fTableViewer = new TableViewer(fTable);
 		fTableViewer.setUseHashlookup(true);
-		fTableViewer.setContentProvider(new ArrayContentProvider());
+		fTableViewer.setContentProvider(ArrayContentProvider.getInstance());
 		
 		//Bug 307542 - [Accessibility] Error Parser Options table should be accessible by keyboard
 		TableViewerFocusCellManager focusCellManager = new TableViewerFocusCellManager(fTableViewer,new FocusCellOwnerDrawHighlighter(fTableViewer));
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java
index b7fb476d151..c3c03e08c44 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java
@@ -94,7 +94,7 @@ public class AddSourceContainerDialog extends TitleAreaDialog {
 		}
 		
 		fViewer.setLabelProvider(new SourceContainerLabelProvider());
-		fViewer.setContentProvider(new ArrayContentProvider());			
+		fViewer.setContentProvider(ArrayContentProvider.getInstance());
 		fViewer.setSorter(new ViewerSorter());
 		fViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 			@Override