[NRefactory.CSharp] Added missing files.

36 files changed, 78 insertions, 72 deletions

diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Makefile.am b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Makefile.am
index c87b541d39..770d5c088c 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Makefile.am
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Makefile.am
@@ -9,12 +9,12 @@ DEPS =  \
 	$(top_builddir)/build/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:../../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Core \
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/Makefile.am b/main/src/addins/AspNet/MonoDevelop.AspNet/Makefile.am
index 95126524c1..83b061d0c0 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet/Makefile.am
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/Makefile.am
@@ -11,13 +11,13 @@ DEPS =  \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.CSharp.dll \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Configuration \
diff --git a/main/src/addins/CBinding/Makefile.am b/main/src/addins/CBinding/Makefile.am
index 5eea5059c2..5d3431f739 100644
--- a/main/src/addins/CBinding/Makefile.am
+++ b/main/src/addins/CBinding/Makefile.am
@@ -10,13 +10,13 @@ DEPS =  \
 	$(top_builddir)/build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Core \
diff --git a/main/src/addins/ChangeLogAddIn/Makefile.am b/main/src/addins/ChangeLogAddIn/Makefile.am
index cae06f3a0c..a45df96055 100644
--- a/main/src/addins/ChangeLogAddIn/Makefile.am
+++ b/main/src/addins/ChangeLogAddIn/Makefile.am
@@ -5,13 +5,13 @@ DEPS =  \
 	$(top_builddir)/build/AddIns/VersionControl/MonoDevelop.VersionControl.dll \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix
 
 FILES =  \
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile.am b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile.am
index ee6f2f3464..87217c65b8 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile.am
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/Makefile.am
@@ -4,13 +4,13 @@ ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.Deployment.Linux.dll
 
 DEPS =  \
 	$(top_builddir)/build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Xml 
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/Makefile.am b/main/src/addins/Deployment/MonoDevelop.Deployment/Makefile.am
index b0534622ae..4cc94f5b92 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/Makefile.am
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/Makefile.am
@@ -4,13 +4,13 @@ ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.Deployment.dll
 
 DEPS =  \
 	$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../../build/bin/MonoDevelop.Ide.dll \
 	-r:ICSharpCode.SharpZipLib \
 	-r:Mono.Posix \
 	-r:System \
diff --git a/main/src/addins/GnomePlatform/Makefile.am b/main/src/addins/GnomePlatform/Makefile.am
index 38b4521c94..07c24c2ce0 100644
--- a/main/src/addins/GnomePlatform/Makefile.am
+++ b/main/src/addins/GnomePlatform/Makefile.am
@@ -2,7 +2,9 @@
 ADDIN_BUILD = $(top_builddir)/build/AddIns
 ASSEMBLY = $(ADDIN_BUILD)/GnomePlatform.dll
 
-DEPS = $(top_builddir)/build/bin/MonoDevelop.Core.dll
+DEPS =  \
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GCONF_SHARP_LIBS) \
@@ -10,7 +12,6 @@ REFS =  \
 	$(GNOME_SHARP_LIBS) \
 	$(GNOME_VFS_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:System
 
 FILES =  \
diff --git a/main/src/addins/ILAsmBinding/Makefile.am b/main/src/addins/ILAsmBinding/Makefile.am
index f64373008e..54c9b5aa23 100644
--- a/main/src/addins/ILAsmBinding/Makefile.am
+++ b/main/src/addins/ILAsmBinding/Makefile.am
@@ -2,13 +2,14 @@
 ADDIN_BUILD = $(top_builddir)/build/AddIns/BackendBindings
 ASSEMBLY = $(ADDIN_BUILD)/ILAsmBinding.dll
 
-DEPS = $(top_builddir)/build/bin/MonoDevelop.Core.dll
+DEPS =  \
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Xml
diff --git a/main/src/addins/MacPlatform/Makefile.am b/main/src/addins/MacPlatform/Makefile.am
index b622d59e61..658671de7f 100644
--- a/main/src/addins/MacPlatform/Makefile.am
+++ b/main/src/addins/MacPlatform/Makefile.am
@@ -5,13 +5,14 @@ ASSEMBLY = $(ADDIN_BUILD)/MacPlatform.dll
 MONOMAC_SRC = $(top_srcdir)/../extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll
 MONOMAC = $(ADDIN_BUILD)/MonoMac.dll
 
-DEPS = $(top_builddir)/build/bin/MonoDevelop.Core.dll
+DEPS =  \
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	-r:../../../../extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Core \
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/Makefile.am b/main/src/addins/MonoDevelop.AssemblyBrowser/Makefile.am
index f2428f4051..a1c297e76c 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/Makefile.am
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/Makefile.am
@@ -47,13 +47,13 @@ DEPS =  \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.Cecil.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Cairo \
 	-r:Mono.Posix \
 	-r:System \
diff --git a/main/src/addins/MonoDevelop.Autotools/Makefile.am b/main/src/addins/MonoDevelop.Autotools/Makefile.am
index 4ca04067c9..4be733a990 100644
--- a/main/src/addins/MonoDevelop.Autotools/Makefile.am
+++ b/main/src/addins/MonoDevelop.Autotools/Makefile.am
@@ -5,13 +5,13 @@ ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.Autotools.dll
 DEPS =  \
 	$(top_builddir)/build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll \
 	$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix \
 	-r:System 
 
diff --git a/main/src/addins/MonoDevelop.CodeMetrics/Makefile.am b/main/src/addins/MonoDevelop.CodeMetrics/Makefile.am
index 9de5215e69..c85b70afff 100644
--- a/main/src/addins/MonoDevelop.CodeMetrics/Makefile.am
+++ b/main/src/addins/MonoDevelop.CodeMetrics/Makefile.am
@@ -7,13 +7,13 @@ DEPS =  \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.CSharp.dll \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Core \
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile.am b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile.am
index 73b572c198..d61dda9a83 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile.am
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile.am
@@ -9,12 +9,12 @@ DEPS =  \
 	$(top_builddir)/build/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll \
 	$(top_builddir)/build/bin/Mono.Debugging.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:../../../../build/bin/MonoDevelop.Ide.dll \
 	-r:System \
 	-r:System.Core
 
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile.am b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile.am
index 0ea6b7ee64..5b35e95c84 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile.am
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Makefile.am
@@ -9,12 +9,12 @@ DEPS =  \
 	$(top_builddir)/build/AddIns/MonoDevelop.Moonlight/MonoDevelop.Moonlight.dll \
 	$(top_builddir)/build/bin/Mono.Debugging.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:../../../../build/bin/MonoDevelop.Ide.dll \
 	-r:System \
 	-r:System.Core
 
diff --git a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile.am b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile.am
index ff48801a6e..a0f3082da3 100644
--- a/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile.am
+++ b/main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile.am
@@ -8,12 +8,12 @@ DEPS =  \
 	$(top_builddir)/build/bin/Mono.Cecil.dll \
 	$(top_builddir)/build/bin/Mono.Debugging.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:../../../../build/bin/MonoDevelop.Ide.dll \
 	-r:System \
 	-r:System.Core
 
diff --git a/main/src/addins/MonoDevelop.Debugger/Makefile.am b/main/src/addins/MonoDevelop.Debugger/Makefile.am
index 59a06909df..780110cc89 100644
--- a/main/src/addins/MonoDevelop.Debugger/Makefile.am
+++ b/main/src/addins/MonoDevelop.Debugger/Makefile.am
@@ -8,13 +8,13 @@ DEPS =  \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.Debugging.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Cairo \
 	-r:Mono.Posix \
 	-r:System \
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/Makefile.am b/main/src/addins/MonoDevelop.DesignerSupport/Makefile.am
index 920673fc9e..c13de6c5d8 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/Makefile.am
+++ b/main/src/addins/MonoDevelop.DesignerSupport/Makefile.am
@@ -5,13 +5,13 @@ DEPS =  \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.Cecil.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Cairo \
 	-r:Mono.Posix \
 	-r:System \
diff --git a/main/src/addins/MonoDevelop.Gettext/Makefile.am b/main/src/addins/MonoDevelop.Gettext/Makefile.am
index d262506a46..8771f086cb 100644
--- a/main/src/addins/MonoDevelop.Gettext/Makefile.am
+++ b/main/src/addins/MonoDevelop.Gettext/Makefile.am
@@ -8,13 +8,13 @@ DEPS =  \
 	$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Core \
diff --git a/main/src/addins/MonoDevelop.GtkCore/Makefile.am b/main/src/addins/MonoDevelop.GtkCore/Makefile.am
index 9dcd90e743..ea49ad60bf 100644
--- a/main/src/addins/MonoDevelop.GtkCore/Makefile.am
+++ b/main/src/addins/MonoDevelop.GtkCore/Makefile.am
@@ -12,14 +12,14 @@ DEPS =  \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.Cecil.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLADE_SHARP_LIBS) \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Core \
diff --git a/main/src/addins/MonoDevelop.HexEditor/Makefile.am b/main/src/addins/MonoDevelop.HexEditor/Makefile.am
index f191c4315b..5b42ee17c5 100644
--- a/main/src/addins/MonoDevelop.HexEditor/Makefile.am
+++ b/main/src/addins/MonoDevelop.HexEditor/Makefile.am
@@ -50,14 +50,14 @@ DEPS =  \
 	$(top_builddir)/build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLADE_SHARP_LIBS) \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Cairo \
 	-r:Mono.Posix \
 	-r:System \
diff --git a/main/src/addins/MonoDevelop.MacDev/Makefile.am b/main/src/addins/MonoDevelop.MacDev/Makefile.am
index 454438bf32..ccd87fff7c 100644
--- a/main/src/addins/MonoDevelop.MacDev/Makefile.am
+++ b/main/src/addins/MonoDevelop.MacDev/Makefile.am
@@ -8,14 +8,14 @@ DEPS =  \
 	../../../build/AddIns/VersionControl/MonoDevelop.VersionControl.dll \
 	../../../build/bin/ICSharpCode.NRefactory.dll \
 	../../../build/bin/Mono.TextEditor.dll \
-	../../../build/bin/MonoDevelop.Core.dll
+	../../../build/bin/MonoDevelop.Core.dll \
+	../../../build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
 	-r:../../../../extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Cairo \
 	-r:Mono.Posix \
 	-r:System \
diff --git a/main/src/addins/MonoDevelop.Moonlight/Makefile.am b/main/src/addins/MonoDevelop.Moonlight/Makefile.am
index 07e1dfcca3..081c83253a 100644
--- a/main/src/addins/MonoDevelop.Moonlight/Makefile.am
+++ b/main/src/addins/MonoDevelop.Moonlight/Makefile.am
@@ -7,12 +7,12 @@ DEPS =  \
 	$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
 	$(top_builddir)/build/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:ICSharpCode.SharpZipLib \
 	-r:Mono.Posix \
 	-r:System \
diff --git a/main/src/addins/MonoDevelop.Refactoring/Makefile.am b/main/src/addins/MonoDevelop.Refactoring/Makefile.am
index 78d328630b..c637b8fc9f 100644
--- a/main/src/addins/MonoDevelop.Refactoring/Makefile.am
+++ b/main/src/addins/MonoDevelop.Refactoring/Makefile.am
@@ -8,13 +8,13 @@ DEPS =  \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.CSharp.dll \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Cairo \
 	-r:Mono.Posix \
 	-r:System \
diff --git a/main/src/addins/MonoDevelop.RegexToolkit/Makefile.am b/main/src/addins/MonoDevelop.RegexToolkit/Makefile.am
index 58c2d1bb6e..50219a8274 100644
--- a/main/src/addins/MonoDevelop.RegexToolkit/Makefile.am
+++ b/main/src/addins/MonoDevelop.RegexToolkit/Makefile.am
@@ -22,11 +22,11 @@ REFS =  \
 FILES =  \
 	AssemblyInfo.cs \
 	gtk-gui/generated.cs \
-	gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWidget.cs \
 	gtk-gui/MonoDevelop.RegexToolkit.ElementHelpWidget.cs \
+	gtk-gui/MonoDevelop.RegexToolkit.RegexToolkitWidget.cs \
 	MonoDevelop.RegexToolkit/Commands.cs \
-	MonoDevelop.RegexToolkit/RegexToolkitWidget.cs \
-	MonoDevelop.RegexToolkit/ElementHelpWidget.cs
+	MonoDevelop.RegexToolkit/ElementHelpWidget.cs \
+	MonoDevelop.RegexToolkit/RegexToolkitWidget.cs
 
 RES =  \
 	gtk-gui/gui.stetic \
diff --git a/main/src/addins/MonoDevelop.WebReferences/Makefile.am b/main/src/addins/MonoDevelop.WebReferences/Makefile.am
index 5e417d4632..54749f7638 100644
--- a/main/src/addins/MonoDevelop.WebReferences/Makefile.am
+++ b/main/src/addins/MonoDevelop.WebReferences/Makefile.am
@@ -2,13 +2,14 @@
 ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoDevelop.WebReferences
 ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.WebReferences.dll
 
-DEPS = $(top_builddir)/build/bin/MonoDevelop.Core.dll
+DEPS =  \
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Configuration \
diff --git a/main/src/addins/MonoDevelop.XmlEditor/Makefile.am b/main/src/addins/MonoDevelop.XmlEditor/Makefile.am
index efbd831f62..cb47c85432 100644
--- a/main/src/addins/MonoDevelop.XmlEditor/Makefile.am
+++ b/main/src/addins/MonoDevelop.XmlEditor/Makefile.am
@@ -9,14 +9,14 @@ DEPS =  \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.Debugging.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLADE_SHARP_LIBS) \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Core \
diff --git a/main/src/addins/MonoDeveloperExtensions/Makefile.am b/main/src/addins/MonoDeveloperExtensions/Makefile.am
index 1567703870..31477fdbd2 100644
--- a/main/src/addins/MonoDeveloperExtensions/Makefile.am
+++ b/main/src/addins/MonoDeveloperExtensions/Makefile.am
@@ -7,12 +7,13 @@ FILES =  \
 	MonoMakefileFormat.cs \
 	MonoSolutionItemHandler.cs
 
-DEPS = $(top_builddir)/build/bin/MonoDevelop.Core.dll
+DEPS =  \
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:System \
 	-r:System.Data \
 	-r:System.Xml
diff --git a/main/src/addins/NUnit/Makefile.am b/main/src/addins/NUnit/Makefile.am
index f8704e0c5c..4dcf8974ad 100644
--- a/main/src/addins/NUnit/Makefile.am
+++ b/main/src/addins/NUnit/Makefile.am
@@ -7,14 +7,14 @@ DEPS =  \
 	$(top_builddir)/build/AddIns/NUnit/NUnitRunner.dll \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLADE_SHARP_LIBS) \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:$(top_srcdir)/build/bin/MonoDevelop.Ide.dll \
 	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.dll \
 	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.core.interfaces.dll \
 	-r:$(top_srcdir)/src/addins/NUnit/lib/nunit.framework.dll \
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Makefile.am b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Makefile.am
index cb6cc46f9a..670a6eabe3 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Makefile.am
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/Makefile.am
@@ -7,12 +7,12 @@ DEPS =  \
 	$(top_builddir)/build/AddIns/MonoDevelop.TextTemplating/Mono.TextTemplating.dll \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:../../../../build/bin/MonoDevelop.Ide.dll \
 	-r:System \
 	-r:System.Core
 
diff --git a/main/src/addins/VBNetBinding/Makefile.am b/main/src/addins/VBNetBinding/Makefile.am
index 4ea960bcb3..354e928849 100644
--- a/main/src/addins/VBNetBinding/Makefile.am
+++ b/main/src/addins/VBNetBinding/Makefile.am
@@ -4,13 +4,13 @@ ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.VBNetBinding.dll
 
 DEPS =  \
 	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
 	$(top_builddir)/build/bin/OldNRefactory.dll 
 	
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Core \
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am
index b0e99af144..1759861107 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am
@@ -8,6 +8,7 @@ DEPS =  \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
 	$(top_builddir)/contrib/bin/NGit.dll \
 	$(top_builddir)/contrib/bin/NSch.dll \
 	$(top_builddir)/contrib/bin/Sharpen.dll
@@ -15,7 +16,6 @@ DEPS =  \
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:../../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Core
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile.am b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile.am
index 20cade8045..0bb8b9735e 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile.am
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile.am
@@ -7,12 +7,12 @@ DEPS =  \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.CSharp.dll \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:../../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Core
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/Makefile.am b/main/src/addins/VersionControl/MonoDevelop.VersionControl/Makefile.am
index 755297b2fe..6ae08a3ac1 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/Makefile.am
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/Makefile.am
@@ -88,13 +88,13 @@ DEPS =  \
 	$(top_builddir)/build/bin/ICSharpCode.NRefactory.dll \
 	$(top_builddir)/build/bin/Mono.Debugging.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Cairo \
 	-r:Mono.Posix \
 	-r:System \
diff --git a/main/src/addins/prj2make-sharp-lib/Makefile.am b/main/src/addins/prj2make-sharp-lib/Makefile.am
index 64a94a9a7a..ba37cfcbf0 100644
--- a/main/src/addins/prj2make-sharp-lib/Makefile.am
+++ b/main/src/addins/prj2make-sharp-lib/Makefile.am
@@ -9,12 +9,12 @@ DEPS =  \
 	$(top_builddir)/build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
 	$(top_builddir)/build/bin/OldNRefactory.dll
 
 REFS =  \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Xml
diff --git a/main/src/core/MonoDevelop.Startup/Makefile.am b/main/src/core/MonoDevelop.Startup/Makefile.am
index aaabb7dd6b..b52b1719fd 100644
--- a/main/src/core/MonoDevelop.Startup/Makefile.am
+++ b/main/src/core/MonoDevelop.Startup/Makefile.am
@@ -9,11 +9,11 @@ RES =
 
 all: $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY).config
 
-DEPS = $(top_builddir)/build/bin/MonoDevelop.Core.dll
+DEPS =  \
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
-REFS =  \
-	$(MONO_ADDINS_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll
+REFS = $(MONO_ADDINS_LIBS)
 
 ICON = $(top_builddir)/theme-icons/Windows/monodevelop.ico
 
diff --git a/main/src/tools/mdmonitor/Makefile.am b/main/src/tools/mdmonitor/Makefile.am
index b639c15193..1708e59e38 100644
--- a/main/src/tools/mdmonitor/Makefile.am
+++ b/main/src/tools/mdmonitor/Makefile.am
@@ -34,14 +34,15 @@ REFS =  \
 	$(GLADE_SHARP_LIBS) \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:../../../build/bin/MonoDevelop.Ide.dll \
 	-r:Mono.Cairo \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Core \
 	-r:System.Xml
 
-DEPS = $(top_builddir)/build/bin/MonoDevelop.Core.dll
+DEPS =  \
+	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
 
 
 $(ASSEMBLY): $(build_sources) $(build_resources) $(DEPS)