diff --git a/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj b/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj
index 1b8fc54e26..b0b2e6f4f9 100644
--- a/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj
+++ b/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj
@@ -43,6 +43,11 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="FormattingTests\TestBraceStlye.cs" />
+    <Compile Include="FormattingTests\TestFormattingBugs.cs" />
+    <Compile Include="FormattingTests\TestSpacingVisitor.cs" />
+    <Compile Include="FormattingTests\TestStatementIndentation.cs" />
+    <Compile Include="FormattingTests\TestTypeLevelIndentation.cs" />
     <Compile Include="MyClassTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
diff --git a/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj b/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
index e1424479df..4900d783de 100644
--- a/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
+++ b/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
@@ -128,6 +128,17 @@
     <Compile Include="CSharp\Dom\TypeMembers\ParameterDeclarationExpression.cs" />
     <Compile Include="CSharp\Dom\TypeMembers\PropertyDeclaration.cs" />
     <Compile Include="CSharp\Dom\TypeMembers\VariableInitializer.cs" />
+    <Compile Include="CSharp\Formatter\CSharpFormattingPolicy.cs" />
+    <Compile Include="CSharp\Formatter\DomIndentationVisitor.cs" />
+    <Compile Include="CSharp\Formatter\DomSpacingVisitor.cs" />
+    <Compile Include="CSharp\Formatter\Indent.cs" />
+    <Compile Include="CSharp\Parser\CSharpParser.cs" />
+    <Compile Include="CSharp\Parser\mcs\CryptoConvert.cs" />
+    <Compile Include="CSharp\Parser\mcs\MonoSymbolFile.cs" />
+    <Compile Include="CSharp\Parser\mcs\MonoSymbolTable.cs" />
+    <Compile Include="CSharp\Parser\mcs\MonoSymbolWriter.cs" />
+    <Compile Include="CSharp\Parser\mcs\outline.cs" />
+    <Compile Include="CSharp\Parser\mcs\roottypes.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TypeSystem\Accessibility.cs" />
     <Compile Include="TypeSystem\CecilProjectContent.cs" />
@@ -176,6 +187,54 @@
     <Compile Include="TypeSystem\ITypeResolveContext.cs" />
     <Compile Include="TypeSystem\IVariable.cs" />
     <Compile Include="TypeSystem\SharedTypes.cs" />
+    <Compile Include="CSharp\Parser\mcs\cs-parser.cs" />
+    <Compile Include="CSharp\Parser\mcs\expression.cs" />
+    <Compile Include="CSharp\Parser\mcs\ecore.cs" />
+    <Compile Include="CSharp\Parser\mcs\statement.cs" />
+    <Compile Include="CSharp\Parser\mcs\class.cs" />
+    <Compile Include="CSharp\Parser\mcs\generic.cs" />
+    <Compile Include="CSharp\Parser\mcs\cs-tokenizer.cs" />
+    <Compile Include="CSharp\Parser\mcs\method.cs" />
+    <Compile Include="CSharp\Parser\mcs\convert.cs" />
+    <Compile Include="CSharp\Parser\mcs\anonymous.cs" />
+    <Compile Include="CSharp\Parser\mcs\constant.cs" />
+    <Compile Include="CSharp\Parser\mcs\attribute.cs" />
+    <Compile Include="CSharp\Parser\mcs\driver.cs" />
+    <Compile Include="CSharp\Parser\mcs\flowanalysis.cs" />
+    <Compile Include="CSharp\Parser\mcs\decl.cs" />
+    <Compile Include="CSharp\Parser\mcs\codegen.cs" />
+    <Compile Include="CSharp\Parser\mcs\property.cs" />
+    <Compile Include="CSharp\Parser\mcs\membercache.cs" />
+    <Compile Include="CSharp\Parser\mcs\namespace.cs" />
+    <Compile Include="CSharp\Parser\mcs\eval.cs" />
+    <Compile Include="CSharp\Parser\mcs\parameter.cs" />
+    <Compile Include="CSharp\Parser\mcs\import.cs" />
+    <Compile Include="CSharp\Parser\mcs\cfold.cs" />
+    <Compile Include="CSharp\Parser\mcs\doc.cs" />
+    <Compile Include="CSharp\Parser\mcs\typespec.cs" />
+    <Compile Include="CSharp\Parser\mcs\nullable.cs" />
+    <Compile Include="CSharp\Parser\mcs\typemanager.cs" />
+    <Compile Include="CSharp\Parser\mcs\iterators.cs" />
+    <Compile Include="CSharp\Parser\mcs\report.cs" />
+    <Compile Include="CSharp\Parser\mcs\delegate.cs" />
+    <Compile Include="CSharp\Parser\mcs\dynamic.cs" />
+    <Compile Include="CSharp\Parser\mcs\linq.cs" />
+    <Compile Include="CSharp\Parser\mcs\field.cs" />
+    <Compile Include="CSharp\Parser\mcs\assign.cs" />
+    <Compile Include="CSharp\Parser\mcs\context.cs" />
+    <Compile Include="CSharp\Parser\mcs\location.cs" />
+    <Compile Include="CSharp\Parser\mcs\pending.cs" />
+    <Compile Include="CSharp\Parser\mcs\argument.cs" />
+    <Compile Include="CSharp\Parser\mcs\rootcontext.cs" />
+    <Compile Include="CSharp\Parser\mcs\visit.cs" />
+    <Compile Include="CSharp\Parser\mcs\enum.cs" />
+    <Compile Include="CSharp\Parser\mcs\const.cs" />
+    <Compile Include="CSharp\Parser\mcs\modifiers.cs" />
+    <Compile Include="CSharp\Parser\mcs\symbolwriter.cs" />
+    <Compile Include="CSharp\Parser\mcs\lambda.cs" />
+    <Compile Include="CSharp\Parser\mcs\support.cs" />
+    <Compile Include="CSharp\Parser\mcs\complete.cs" />
+    <Compile Include="CSharp\Parser\mcs\literal.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>
\ No newline at end of file