diff --git a/cpp/ycm/IdentifierCompleter.h b/cpp/ycm/IdentifierCompleter.h
index eb785530..2028e0a9 100644
--- a/cpp/ycm/IdentifierCompleter.h
+++ b/cpp/ycm/IdentifierCompleter.h
@@ -18,8 +18,6 @@
 #ifndef COMPLETER_H_7AR4UGXE
 #define COMPLETER_H_7AR4UGXE
 
-// TODO: can we remove the inclusion of Candidate.h now?
-#include "Candidate.h"
 #include "ConcurrentLatestValue.h"
 #include "Future.h"
 
@@ -34,12 +32,9 @@
 namespace YouCompleteMe
 {
 
+class Candidate;
 class CandidateRepository;
 
-// candidate text string -> candidate objects
-// typedef boost::unordered_map< std::string, const Candidate* >
-//           CandidateRepository;
-
 // filepath -> *( *candidate )
 typedef boost::unordered_map< std::string,
           boost::shared_ptr< std::list< const Candidate* > > >