diff --git a/src/main/cpp/option_processor-internal.h b/src/main/cpp/option_processor-internal.h
index 301d2be..8ebfb64 100644
--- a/src/main/cpp/option_processor-internal.h
+++ b/src/main/cpp/option_processor-internal.h
@@ -17,6 +17,8 @@
 
 #include <algorithm>
 
+#include "src/main/cpp/rc_file.h"
+#include "src/main/cpp/util/exit_code.h"
 #include "src/main/cpp/util/file.h"
 
 namespace blaze {
@@ -28,6 +30,11 @@
 std::vector<std::string> DedupeBlazercPaths(
     const std::vector<std::string>& paths);
 
+std::string FindRcAlongsideBinary(const std::string& cwd,
+                                  const std::string& path_to_binary);
+
+blaze_exit_code::ExitCode ParseErrorToExitCode(RcFile::ParseError parse_error);
+
 }  // namespace internal
 }  // namespace blaze
 
diff --git a/src/main/cpp/option_processor.cc b/src/main/cpp/option_processor.cc
index 6823757..6fa48fe 100644
--- a/src/main/cpp/option_processor.cc
+++ b/src/main/cpp/option_processor.cc
@@ -167,7 +167,6 @@
   return blaze_exit_code::SUCCESS;
 }
 
-// TODO(#4502 related cleanup) This should be an anonymous namespace.
 namespace internal {
 
 vector<string> DedupeBlazercPaths(const vector<string>& paths) {