Add some name changes in to allow merge

Signed-off-by: Ben Taylor <ben.taylor@linaro.org>
diff --git a/programs/fuzz/onefile.c b/programs/fuzz/onefile.c
index 4835128..6c02a64 100644
--- a/programs/fuzz/onefile.c
+++ b/programs/fuzz/onefile.c
@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "fuzz_common.h"
+#include "common.h"
 
 /* This file doesn't use any Mbed TLS function, but grab mbedtls_config.h anyway
  * in case it contains platform-specific #defines related to malloc or