Add fixes based on test fuzzing.
diff --git a/cper-utils.h b/cper-utils.h
index cea6e0a..18f1e0f 100644
--- a/cper-utils.h
+++ b/cper-utils.h
@@ -4,6 +4,8 @@
#define GUID_STRING_LENGTH 30
#define TIMESTAMP_LENGTH 24
+#include "common-utils.h"
+
json_object* cper_generic_error_status_to_ir(EFI_GENERIC_ERROR_STATUS* error_status);
void ir_generic_error_status_to_cper(json_object* error_status, EFI_GENERIC_ERROR_STATUS* error_status_cper);
json_object* uniform_struct_to_ir(UINT32* start, int len, const char* names[]);
@@ -23,8 +25,6 @@
void guid_to_string(char* out, EFI_GUID* guid);
void string_to_guid(EFI_GUID* out, const char* guid);
int guid_equal(EFI_GUID* a, EFI_GUID* b);
-int bcd_to_int(UINT8 bcd);
-UINT8 int_to_bcd(int value);
//The available severity types for CPER.
extern const char* CPER_SEVERITY_TYPES[4];