--- a/ui/listutil.h	Tue Feb 11 17:57:55 2014 +0000
+++ b/ui/listutil.h	Wed Feb 12 16:52:27 2014 +0000
@@ -1,14 +1,20 @@
+#ifndef LISTUTIL_H
+#define LISTUTIL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #include <stddef.h>
 
 /**
  * @file listutil.h
  * @brief Functions to work with the certificate list.
- *
- * This file definies the function 
  */
 
-/* Status of the List Operations */
+/**
+ * @brief Status of the List Operations
+ */
 typedef enum {
     Unknown = 0, // Not yet parsed
     UnknownError = 1, // The expected unexpected
@@ -35,5 +41,8 @@
  *
  * @return status of the operation.
  */
-list_status_t readAndVerifyList(char* fileName, void *data, size_t *size);
-
+list_status_t readAndVerifyList(const char *fileName, char **data, size_t *size);
+#ifdef __cplusplus
+}
+#endif
+#endif