diff --git a/cper-utils.c b/cper-utils.c
index 84186ad..aee1792 100644
--- a/cper-utils.c
+++ b/cper-utils.c
@@ -131,7 +131,7 @@
 }
 
 //Converts a single integer value to an object containing a value, and a readable name if possible.
-json_object *integer_to_readable_pair(UINT64 value, int len, int keys[],
+json_object *integer_to_readable_pair(UINT64 value, int len, const int keys[],
 				      const char *values[],
 				      const char *default_value)
 {
@@ -151,7 +151,8 @@
 }
 
 //Converts a single integer value to an object containing a value, readable name and description if possible.
-json_object *integer_to_readable_pair_with_desc(int value, int len, int keys[],
+json_object *integer_to_readable_pair_with_desc(int value, int len,
+						const int keys[],
 						const char *values[],
 						const char *descriptions[],
 						const char *default_value)
diff --git a/cper-utils.h b/cper-utils.h
index 9ab7a5a..22280fe 100644
--- a/cper-utils.h
+++ b/cper-utils.h
@@ -18,10 +18,11 @@
 			  const char *names[]);
 void ir_to_uniform_struct64(json_object *ir, UINT64 *start, int len,
 			    const char *names[]);
-json_object *integer_to_readable_pair(UINT64 value, int len, int keys[],
+json_object *integer_to_readable_pair(UINT64 value, int len, const int keys[],
 				      const char *values[],
 				      const char *default_value);
-json_object *integer_to_readable_pair_with_desc(int value, int len, int keys[],
+json_object *integer_to_readable_pair_with_desc(int value, int len,
+						const int keys[],
 						const char *values[],
 						const char *descriptions[],
 						const char *default_value);
diff --git a/generator/cper-generate.c b/generator/cper-generate.c
index c14cbd3..c42e075 100644
--- a/generator/cper-generate.c
+++ b/generator/cper-generate.c
@@ -13,7 +13,7 @@
 #include "cper-generate.h"
 
 EFI_ERROR_SECTION_DESCRIPTOR *generate_section_descriptor(char *type,
-							  size_t *lengths,
+							  const size_t *lengths,
 							  int index,
 							  int num_sections);
 size_t generate_section(void **location, char *type);
@@ -117,7 +117,7 @@
 
 //Generates a single section descriptor for a section with the given properties.
 EFI_ERROR_SECTION_DESCRIPTOR *generate_section_descriptor(char *type,
-							  size_t *lengths,
+							  const size_t *lengths,
 							  int index,
 							  int num_sections)
 {
diff --git a/json-schema.c b/json-schema.c
index 4a9048a..e0f55c0 100644
--- a/json-schema.c
+++ b/json-schema.c
@@ -25,7 +25,7 @@
 int validate_integer(const char *field_name, json_object *schema,
 		     json_object *object, char *error_message);
 int validate_string(const char *field_name, json_object *schema,
-		    json_object *object, char *error_message);
+		    json_object *object, const char *error_message);
 int validate_object(const char *field_name, json_object *schema,
 		    json_object *object, char *error_message);
 int validate_array(const char *field_name, json_object *schema,
@@ -284,7 +284,7 @@
 
 //Validates a single string value according to the given specification.
 int validate_string(const char *field_name, json_object *schema,
-		    json_object *object, char *error_message)
+		    json_object *object, const char *error_message)
 {
 	//todo: if there is a "pattern" field, verify the string with RegEx.
 	(void)field_name;