diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..d5e8eee9b0
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "src/Libraries/AvalonEdit"]
+	path = src/Libraries/AvalonEdit
+	url = https://github.com/icsharpcode/AvalonEdit.git
+[submodule "src/Libraries/NRefactory"]
+	path = src/Libraries/NRefactory
+	url = https://github.com/icsharpcode/NRefactory.git
+[submodule "src/Libraries/cecil"]
+	path = src/Libraries/cecil
+	url = https://github.com/jbevain/cecil.git
diff --git a/clean.bat b/clean.bat
index 98b7efba83..3b6b2a7f52 100755
--- a/clean.bat
+++ b/clean.bat
@@ -1,5 +1,8 @@
 @set PROGFILES=%PROGRAMFILES%
 @if exist "%PROGRAMFILES(x86)%" set PROGFILES=%PROGRAMFILES(x86)%
+@if not exist "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.sln" (
+	git submodule update --init || exit /b 1
+)
 "%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Debug
 @IF %ERRORLEVEL% NEQ 0 PAUSE
 "%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Release
diff --git a/debugbuild.bat b/debugbuild.bat
index 7d4ad2a1ad..fbc59e4a41 100755
--- a/debugbuild.bat
+++ b/debugbuild.bat
@@ -1,5 +1,8 @@
 @set PROGFILES=%PROGRAMFILES%
 @if exist "%PROGRAMFILES(x86)%" set PROGFILES=%PROGRAMFILES(x86)%
+@if not exist "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.sln" (
+	git submodule update --init || exit /b 1
+)
 "%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /p:Configuration=Debug "/p:Platform=Any CPU" %*
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @exit /B 0
diff --git a/releasebuild.bat b/releasebuild.bat
index 2a49d9c333..f893b6f31c 100755
--- a/releasebuild.bat
+++ b/releasebuild.bat
@@ -1,5 +1,8 @@
 @set PROGFILES=%PROGRAMFILES%
 @if exist "%PROGRAMFILES(x86)%" set PROGFILES=%PROGRAMFILES(x86)%
+@if not exist "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.sln" (
+	git submodule update --init || exit /b 1
+)
 "%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /p:Configuration=Release "/p:Platform=Any CPU" %*
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @exit /B 0
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/CSharpSymbolSearch.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/CSharpSymbolSearch.cs
index 6d21e0bb23..c40476b4a3 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/CSharpSymbolSearch.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/CSharpSymbolSearch.cs
@@ -193,7 +193,7 @@ namespace CSharpBinding
 			var cancellationToken = args.ProgressMonitor.CancellationToken;
 			return Task.Run(
 				() => {
-					bool isNameValid = Mono.CSharp.Tokenizer.IsValidIdentifier(args.NewName);
+					bool isNameValid = ICSharpCode.NRefactory.MonoCSharp.Tokenizer.IsValidIdentifier(args.NewName);
 					object progressLock = new object();
 					Parallel.ForEach(
 						searchScopesPerFile.Keys,
diff --git a/src/Libraries/AvalonEdit b/src/Libraries/AvalonEdit
new file mode 160000
index 0000000000..4e69c3cbc5
--- /dev/null
+++ b/src/Libraries/AvalonEdit
@@ -0,0 +1 @@
+Subproject commit 4e69c3cbc51ddf1ac47030abf0c4caac520d23cf
diff --git a/src/Libraries/ICSharpCode.Decompiler/ILAst/ILAstOptimizer.cs b/src/Libraries/ICSharpCode.Decompiler/ILAst/ILAstOptimizer.cs
index 6c8ccbe74c..0fb7f051e7 100644
--- a/src/Libraries/ICSharpCode.Decompiler/ILAst/ILAstOptimizer.cs
+++ b/src/Libraries/ICSharpCode.Decompiler/ILAst/ILAstOptimizer.cs
@@ -24,7 +24,6 @@ using ICSharpCode.Decompiler.FlowAnalysis;
 using ICSharpCode.NRefactory.Utils;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
-using Mono.CSharp;
 
 namespace ICSharpCode.Decompiler.ILAst
 {
diff --git a/src/Libraries/ICSharpCode.Decompiler/ILAst/ILAstTypes.cs b/src/Libraries/ICSharpCode.Decompiler/ILAst/ILAstTypes.cs
index 9cd42a14fc..179b40a673 100644
--- a/src/Libraries/ICSharpCode.Decompiler/ILAst/ILAstTypes.cs
+++ b/src/Libraries/ICSharpCode.Decompiler/ILAst/ILAstTypes.cs
@@ -27,7 +27,6 @@ using ICSharpCode.Decompiler.Disassembler;
 using ICSharpCode.NRefactory.Utils;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
-using Mono.CSharp;
 using Cecil = Mono.Cecil;
 
 namespace ICSharpCode.Decompiler.ILAst
diff --git a/src/Libraries/NRefactory b/src/Libraries/NRefactory
new file mode 160000
index 0000000000..a2b55de351
--- /dev/null
+++ b/src/Libraries/NRefactory
@@ -0,0 +1 @@
+Subproject commit a2b55de351be2119b6f0c3a17c36b5b9adbd7c59
diff --git a/src/Libraries/cecil b/src/Libraries/cecil
new file mode 160000
index 0000000000..53df0bc39e
--- /dev/null
+++ b/src/Libraries/cecil
@@ -0,0 +1 @@
+Subproject commit 53df0bc39e48d8544020856e83f8d8a2e11c8a3a