diff --git a/cpp/ycm/ClangCompleter/ClangUtils.h b/cpp/ycm/ClangCompleter/ClangUtils.h
index 5eb6fbd1..53e0df8f 100644
--- a/cpp/ycm/ClangCompleter/ClangUtils.h
+++ b/cpp/ycm/ClangCompleter/ClangUtils.h
@@ -29,8 +29,8 @@
 
 namespace YouCompleteMe {
 
-typedef boost::shared_ptr<
-  boost::remove_pointer< CXDiagnostic >::type > DiagnosticWrap;
+typedef boost::shared_ptr <
+boost::remove_pointer< CXDiagnostic >::type > DiagnosticWrap;
 
 std::string CXStringToString( CXString text );
 
diff --git a/cpp/ycm/ClangCompleter/CompilationDatabase.cpp b/cpp/ycm/ClangCompleter/CompilationDatabase.cpp
index 080657c1..33eb5bc8 100644
--- a/cpp/ycm/ClangCompleter/CompilationDatabase.cpp
+++ b/cpp/ycm/ClangCompleter/CompilationDatabase.cpp
@@ -27,8 +27,8 @@ using boost::shared_ptr;
 using boost::remove_pointer;
 
 namespace YouCompleteMe {
-typedef shared_ptr<
-  remove_pointer< CXCompileCommands >::type > CompileCommandsWrap;
+typedef shared_ptr <
+remove_pointer< CXCompileCommands >::type > CompileCommandsWrap;
 
 CompilationDatabase::CompilationDatabase(
   const std::string &path_to_directory )
diff --git a/cpp/ycm/ClangCompleter/TranslationUnit.cpp b/cpp/ycm/ClangCompleter/TranslationUnit.cpp
index 6e48507e..4f54a4db 100644
--- a/cpp/ycm/ClangCompleter/TranslationUnit.cpp
+++ b/cpp/ycm/ClangCompleter/TranslationUnit.cpp
@@ -33,8 +33,8 @@ using boost::remove_pointer;
 
 namespace YouCompleteMe {
 
-typedef shared_ptr<
-  remove_pointer< CXCodeCompleteResults >::type > CodeCompleteResultsWrap;
+typedef shared_ptr <
+remove_pointer< CXCodeCompleteResults >::type > CodeCompleteResultsWrap;
 
 TranslationUnit::TranslationUnit(
   const std::string &filename,
@@ -150,7 +150,7 @@ std::vector< CompletionData > TranslationUnit::CandidatesForLocation(
     clang_disposeCodeCompleteResults );
 
   std::vector< CompletionData > candidates = ToCompletionDataVector(
-      results.get() );
+                                               results.get() );
   return candidates;
 }