diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1a780f..62b4ba5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -302,7 +302,7 @@ set(JSON_C_PUBLIC_HEADERS
     ${PROJECT_BINARY_DIR}/json_config.h
 
     ${PROJECT_SOURCE_DIR}/json.h
-    ${PROJECT_SOURCE_DIR}/arraylist.h
+    ${PROJECT_SOURCE_DIR}/json_c_arraylist.h
     ${PROJECT_SOURCE_DIR}/debug.h
     ${PROJECT_SOURCE_DIR}/json_c_version.h
     ${PROJECT_SOURCE_DIR}/json_inttypes.h
@@ -331,7 +331,7 @@ set(JSON_C_HEADERS
 )
 
 set(JSON_C_SOURCES
-    ${PROJECT_SOURCE_DIR}/arraylist.c
+    ${PROJECT_SOURCE_DIR}/json_c_arraylist.c
     ${PROJECT_SOURCE_DIR}/debug.c
     ${PROJECT_SOURCE_DIR}/json_c_version.c
     ${PROJECT_SOURCE_DIR}/json_object.c
diff --git a/json.h b/json.h
index 6c3b43b..99d574e 100644
--- a/json.h
+++ b/json.h
@@ -21,7 +21,7 @@
 extern "C" {
 #endif
 
-#include "arraylist.h"
+#include "json_c_arraylist.h"
 #include "debug.h"
 #include "json_c_version.h"
 #include "json_object.h"
diff --git a/arraylist.c b/json_c_arraylist.c
similarity index 97%
rename from arraylist.c
rename to json_c_arraylist.c
index 12ad8af..aa4c0c5 100644
--- a/arraylist.c
+++ b/json_c_arraylist.c
@@ -1,5 +1,5 @@
 /*
- * $Id: arraylist.c,v 1.4 2006/01/26 02:16:28 mclark Exp $
+ * $Id: json_c_arraylist.c,v 1.4 2006/01/26 02:16:28 mclark Exp $
  *
  * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd.
  * Michael Clark <michael@metaparadigm.com>
@@ -34,7 +34,7 @@
 #endif
 #endif
 
-#include "arraylist.h"
+#include "json_c_arraylist.h"
 
 struct array_list *array_list_new(array_list_free_fn *free_fn)
 {
diff --git a/arraylist.h b/json_c_arraylist.h
similarity index 92%
rename from arraylist.h
rename to json_c_arraylist.h
index 3c4b1b2..4807a5e 100644
--- a/arraylist.h
+++ b/json_c_arraylist.h
@@ -1,5 +1,5 @@
 /*
- * $Id: arraylist.h,v 1.4 2006/01/26 02:16:28 mclark Exp $
+ * $Id: json_c_arraylist.h,v 1.4 2006/01/26 02:16:28 mclark Exp $
  *
  * Copyright (c) 2004, 2005 Metaparadigm Pte. Ltd.
  * Michael Clark <michael@metaparadigm.com>
@@ -15,8 +15,8 @@
  *        Although this is exposed by the json_object_get_array() method,
  *        it is not recommended for direct use.
  */
-#ifndef _arraylist_h_
-#define _arraylist_h_
+#ifndef _json_c_arraylist_h_
+#define _json_c_arraylist_h_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/json_object.c b/json_object.c
index d5ac465..36bee71 100644
--- a/json_object.c
+++ b/json_object.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "arraylist.h"
+#include "json_c_arraylist.h"
 #include "debug.h"
 #include "json_inttypes.h"
 #include "json_object.h"
diff --git a/json_tokener.c b/json_tokener.c
index 840ad12..61ba98d 100644
--- a/json_tokener.c
+++ b/json_tokener.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "arraylist.h"
+#include "json_c_arraylist.h"
 #include "debug.h"
 #include "json_inttypes.h"
 #include "json_object.h"