diff --git a/src/main/cpp/blaze_util.h b/src/main/cpp/blaze_util.h
index 071200c..99ef0e6 100644
--- a/src/main/cpp/blaze_util.h
+++ b/src/main/cpp/blaze_util.h
@@ -28,9 +28,8 @@
 #include <string>
 #include <vector>
 
-#include "blaze_exit_code.h"
-#include "util/numbers.h"
-#include "util/port.h"
+#include "src/main/cpp/util/numbers.h"
+#include "src/main/cpp/util/port.h"
 
 namespace blaze {
 
@@ -95,8 +94,7 @@
 // Returns NULL otherwise.
 bool GetNullaryOption(const char *arg, const char *key);
 
-blaze_exit_code::ExitCode CheckValidPort(
-    const string &str, const string &option, string *error);
+bool CheckValidPort(const string &str, const string &option, string *error);
 
 // Enable messages mostly of interest to developers.
 bool VerboseLogging();