diff --git a/cpp/ycm/Candidate.cpp b/cpp/ycm/Candidate.cpp
index e4479eaa..fa8dd729 100644
--- a/cpp/ycm/Candidate.cpp
+++ b/cpp/ycm/Candidate.cpp
@@ -17,6 +17,7 @@
 
 #include "standard.h"
 #include "Candidate.h"
+#include "Result.h"
 #include <cctype>
 #include <boost/algorithm/string.hpp>
 
diff --git a/cpp/ycm/Candidate.h b/cpp/ycm/Candidate.h
index f03822c5..c1086ae2 100644
--- a/cpp/ycm/Candidate.h
+++ b/cpp/ycm/Candidate.h
@@ -18,9 +18,7 @@
 #ifndef CANDIDATE_H_R5LZH6AC
 #define CANDIDATE_H_R5LZH6AC
 
-// TODO can be moved to cpp?
 #include "LetterNode.h"
-#include "Result.h"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/utility.hpp>
@@ -31,6 +29,8 @@
 namespace YouCompleteMe
 {
 
+class Result;
+
 typedef std::bitset< NUM_LETTERS > Bitset;
 
 Bitset LetterBitsetFromString( const std::string &text );
diff --git a/cpp/ycm/ClangCompleter/ClangCompleter.cpp b/cpp/ycm/ClangCompleter/ClangCompleter.cpp
index 5e3f3f1e..31184ef2 100644
--- a/cpp/ycm/ClangCompleter/ClangCompleter.cpp
+++ b/cpp/ycm/ClangCompleter/ClangCompleter.cpp
@@ -17,6 +17,7 @@
 
 #include "ClangCompleter.h"
 #include "exceptions.h"
+#include "Result.h"
 #include "Candidate.h"
 #include "TranslationUnit.h"
 #include "standard.h"
diff --git a/cpp/ycm/IdentifierCompleter.cpp b/cpp/ycm/IdentifierCompleter.cpp
index 9046bc55..6328cf67 100644
--- a/cpp/ycm/IdentifierCompleter.cpp
+++ b/cpp/ycm/IdentifierCompleter.cpp
@@ -19,6 +19,7 @@
 #include "standard.h"
 #include "CandidateRepository.h"
 #include "Candidate.h"
+#include "Result.h"
 #include "Utils.h"
 #include "IdentifierUtils.h"
 
diff --git a/cpp/ycm/tests/Candidate_test.cpp b/cpp/ycm/tests/Candidate_test.cpp
index 87663d10..a1771ed6 100644
--- a/cpp/ycm/tests/Candidate_test.cpp
+++ b/cpp/ycm/tests/Candidate_test.cpp
@@ -17,6 +17,7 @@
 
 #include <gtest/gtest.h>
 #include "Candidate.h"
+#include "Result.h"
 
 namespace YouCompleteMe
 {