diff --git a/src/kernel/deep_copy.cpp b/src/kernel/deep_copy.cpp
index 4723809c0..568d7ee54 100644
--- a/src/kernel/deep_copy.cpp
+++ b/src/kernel/deep_copy.cpp
@@ -5,7 +5,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #include "expr.h"
-#include "maps.h"
+#include "expr_maps.h"
 #include "buffer.h"
 
 namespace lean {
diff --git a/src/kernel/expr.cpp b/src/kernel/expr.cpp
index 777407977..a78994296 100644
--- a/src/kernel/expr.cpp
+++ b/src/kernel/expr.cpp
@@ -9,7 +9,7 @@ Author: Leonardo de Moura
 #include <sstream>
 #include "expr.h"
 #include "free_vars.h"
-#include "sets.h"
+#include "expr_sets.h"
 #include "hash.h"
 #include "format.h"
 
diff --git a/src/kernel/maps.h b/src/kernel/expr_maps.h
similarity index 100%
rename from src/kernel/maps.h
rename to src/kernel/expr_maps.h
diff --git a/src/kernel/sets.h b/src/kernel/expr_sets.h
similarity index 100%
rename from src/kernel/sets.h
rename to src/kernel/expr_sets.h
diff --git a/src/kernel/for_each.h b/src/kernel/for_each.h
index cc24b88c5..a9939a151 100644
--- a/src/kernel/for_each.h
+++ b/src/kernel/for_each.h
@@ -6,7 +6,7 @@ Author: Leonardo de Moura
 */
 #pragma once
 #include "expr.h"
-#include "sets.h"
+#include "expr_sets.h"
 
 namespace lean {
 template<typename F>
diff --git a/src/kernel/free_vars.cpp b/src/kernel/free_vars.cpp
index 2dc05e8b1..fd51bedf1 100644
--- a/src/kernel/free_vars.cpp
+++ b/src/kernel/free_vars.cpp
@@ -6,7 +6,7 @@ Author: Leonardo de Moura
 */
 #include <algorithm>
 #include "free_vars.h"
-#include "sets.h"
+#include "expr_sets.h"
 #include "replace.h"
 
 namespace lean {
diff --git a/src/kernel/replace.h b/src/kernel/replace.h
index 951d6e045..1925c570a 100644
--- a/src/kernel/replace.h
+++ b/src/kernel/replace.h
@@ -7,7 +7,7 @@ Author: Leonardo de Moura
 #pragma once
 #include "buffer.h"
 #include "expr.h"
-#include "maps.h"
+#include "expr_maps.h"
 namespace lean {
 /**
    \brief Functional for applying <tt>F</tt> to the subexpressions of a given expression.
diff --git a/src/tests/kernel/expr.cpp b/src/tests/kernel/expr.cpp
index bb8f3eeb6..076b0607c 100644
--- a/src/tests/kernel/expr.cpp
+++ b/src/tests/kernel/expr.cpp
@@ -7,7 +7,7 @@ Author: Leonardo de Moura
 */
 #include <algorithm>
 #include "expr.h"
-#include "sets.h"
+#include "expr_sets.h"
 #include "max_sharing.h"
 #include "free_vars.h"
 #include "test.h"
diff --git a/src/tests/kernel/normalize.cpp b/src/tests/kernel/normalize.cpp
index 53f768696..fc0352a58 100644
--- a/src/tests/kernel/normalize.cpp
+++ b/src/tests/kernel/normalize.cpp
@@ -9,7 +9,7 @@ Author: Leonardo de Moura
 #include "builtin.h"
 #include "trace.h"
 #include "test.h"
-#include "sets.h"
+#include "expr_sets.h"
 using namespace lean;
 
 expr normalize(expr const & e) {