diff --git a/ds/org.eclipse.pde.ds.annotations.tests/.settings/org.eclipse.core.resources.prefs b/ds/org.eclipse.pde.ds.annotations.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/ds/org.eclipse.pde.ds.annotations.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ds/org.eclipse.pde.ds.annotations/.settings/org.eclipse.core.resources.prefs b/ds/org.eclipse.pde.ds.annotations/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/ds/org.eclipse.pde.ds.annotations/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ui/org.eclipse.pde.core/OSGI-INF/.gitignore b/ui/org.eclipse.pde.core/OSGI-INF/.gitignore
deleted file mode 100644
index 6fadb41528..0000000000
--- a/ui/org.eclipse.pde.core/OSGI-INF/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.pde.*.xml
diff --git a/ui/org.eclipse.pde.genericeditor.extension.tests/.settings/org.eclipse.core.resources.prefs b/ui/org.eclipse.pde.genericeditor.extension.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/ui/org.eclipse.pde.genericeditor.extension.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ui/org.eclipse.pde.genericeditor.extension/.settings/org.eclipse.core.resources.prefs b/ui/org.eclipse.pde.genericeditor.extension/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/ui/org.eclipse.pde.genericeditor.extension/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ui/org.eclipse.pde.junit.runtime.tests/.settings/org.eclipse.core.resources.prefs b/ui/org.eclipse.pde.junit.runtime.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/ui/org.eclipse.pde.junit.runtime.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ui/org.eclipse.pde.spy.bundle/.settings/org.eclipse.core.resources.prefs b/ui/org.eclipse.pde.spy.bundle/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/ui/org.eclipse.pde.spy.bundle/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ui/org.eclipse.pde.spy.context/.settings/org.eclipse.core.resources.prefs b/ui/org.eclipse.pde.spy.context/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/ui/org.eclipse.pde.spy.context/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ui/org.eclipse.pde.spy.css/.settings/org.eclipse.core.resources.prefs b/ui/org.eclipse.pde.spy.css/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/ui/org.eclipse.pde.spy.css/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ui/org.eclipse.pde.spy.event/.settings/org.eclipse.core.resources.prefs b/ui/org.eclipse.pde.spy.event/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/ui/org.eclipse.pde.spy.event/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ui/org.eclipse.pde.spy.model/.settings/org.eclipse.core.resources.prefs b/ui/org.eclipse.pde.spy.model/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/ui/org.eclipse.pde.spy.model/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ui/org.eclipse.pde.spy.preferences/.settings/org.eclipse.core.resources.prefs b/ui/org.eclipse.pde.spy.preferences/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/ui/org.eclipse.pde.spy.preferences/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.core.resources.prefs b/ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF
index 58fd842325..f7693ec2fe 100644
--- a/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF
@@ -118,8 +118,7 @@ Require-Bundle:
  org.eclipse.help;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.equinox.bidi;bundle-version="[0.10.0,2.0.0)",
  org.eclipse.equinox.security;bundle-version="[1.2.200,2.0.0)",
- biz.aQute.bndlib;bundle-version="6.3.1",
- org.eclipse.ui.navigator
+ biz.aQute.bndlib;bundle-version="6.3.1"
 Import-Package: org.eclipse.jdt.debug.ui.console,
  org.eclipse.ui.internal.genericeditor,
  org.osgi.service.event;version="[1.4,2.0.0)"
diff --git a/ui/org.eclipse.tools.layout.spy/.settings/org.eclipse.core.resources.prefs b/ui/org.eclipse.tools.layout.spy/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..99f26c0203
--- /dev/null
+++ b/ui/org.eclipse.tools.layout.spy/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8