nfdc: merge canonizer.hpp and find-face.hpp into face-helpers.hpp

Change-Id: I19ca5cbce8cab54e61eb7af0a32c33c3aa73faf1
diff --git a/tools/nfdc/status-report.hpp b/tools/nfdc/status-report.hpp
index 20c364d..67ff429 100644
--- a/tools/nfdc/status-report.hpp
+++ b/tools/nfdc/status-report.hpp
@@ -40,12 +40,9 @@
 
 enum class ReportFormat {
   XML = 1,
-  TEXT = 2
+  TEXT = 2,
 };
 
-ReportFormat
-parseReportFormat(const std::string& s);
-
 std::ostream&
 operator<<(std::ostream& os, ReportFormat fmt);