1 files changed, 27 insertions, 11 deletions
diff --git a/tools/llvm-c-test/llvm-c-test.h b/tools/llvm-c-test/llvm-c-test.h
index 7929fc4d19be7..0d1ade093bc7f 100644
--- a/tools/llvm-c-test/llvm-c-test.h
+++ b/tools/llvm-c-test/llvm-c-test.h
@@ -14,30 +14,46 @@
 #define LLVM_C_TEST_H
 
 #include <stdbool.h>
+#include "llvm-c/Core.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 // helpers.c
-void tokenize_stdin(void (*cb)(char **tokens, int ntokens));
+void llvm_tokenize_stdin(void (*cb)(char **tokens, int ntokens));
 
 // module.c
-int module_dump(bool Lazy, bool New);
-int module_list_functions(void);
-int module_list_globals(void);
+LLVMModuleRef llvm_load_module(bool Lazy, bool New);
+int llvm_module_dump(bool Lazy, bool New);
+int llvm_module_list_functions(void);
+int llvm_module_list_globals(void);
 
 // calc.c
-int calc(void);
+int llvm_calc(void);
 
 // disassemble.c
-int disassemble(void);
+int llvm_disassemble(void);
 
 // metadata.c
-int add_named_metadata_operand(void);
-int set_metadata(void);
+int llvm_add_named_metadata_operand(void);
+int llvm_set_metadata(void);
 
 // object.c
-int object_list_sections(void);
-int object_list_symbols(void);
+int llvm_object_list_sections(void);
+int llvm_object_list_symbols(void);
 
 // targets.c
-int targets_list(void);
+int llvm_targets_list(void);
+
+// echo.c
+int llvm_echo(void);
+
+// diagnostic.c
+int llvm_test_diagnostic_handler(void);
+
+#ifdef __cplusplus
+}
+#endif /* !defined(__cplusplus) */
 
 #endif