diff --git a/Documentation/intro/install/general.rst b/Documentation/intro/install/general.rst
index 42b71728914..0f3cb4e4961 100644
--- a/Documentation/intro/install/general.rst
+++ b/Documentation/intro/install/general.rst
@@ -166,7 +166,7 @@ other than plain text, only if you have the following:
 If you are going to extensively modify Open vSwitch, consider installing the
 following to obtain better warnings:
 
-- "sparse" version 0.6.2 or later
+- "sparse" version 0.6.4 or later
   (https://git.kernel.org/pub/scm/devel/sparse/sparse.git/).
 
 - GNU make.
diff --git a/include/sparse/automake.mk b/include/sparse/automake.mk
index 45e6202c52e..052a1b4b82e 100644
--- a/include/sparse/automake.mk
+++ b/include/sparse/automake.mk
@@ -12,10 +12,7 @@ noinst_HEADERS += \
         include/sparse/netinet/ip6.h \
         include/sparse/netpacket/packet.h \
         include/sparse/pthread.h \
-        include/sparse/rte_atomic.h \
-        include/sparse/rte_mbuf.h \
         include/sparse/rte_memcpy.h \
-        include/sparse/rte_trace_point.h \
         include/sparse/sys/socket.h \
         include/sparse/sys/sysmacros.h \
         include/sparse/sys/types.h \
diff --git a/include/sparse/rte_atomic.h b/include/sparse/rte_atomic.h
deleted file mode 100644
index ae49fe5c035..00000000000
--- a/include/sparse/rte_atomic.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright (c) 2015 Nicira, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __CHECKER__
-#error "Use this header only with sparse.  It is not a correct implementation."
-#endif
-
-/* Fix sparse technicality about types in one of the function calls by just
- * ignoring it. */
-#define __sync_add_and_fetch(a, b) (0)
-
-/* Get actual <rte_atomic.h> definitions for us to annotate and build on. */
-#include_next <rte_atomic.h>
diff --git a/include/sparse/rte_mbuf.h b/include/sparse/rte_mbuf.h
deleted file mode 100644
index 981cdb441f0..00000000000
--- a/include/sparse/rte_mbuf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (c) 2020 Intel, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __CHECKER__
-#error "Use this header only with sparse.  It is not a correct implementation."
-#endif
-
-/* sparse doesn't know about gcc atomic builtins. */
-#ifndef __ATOMIC_ACQ_REL
-#define __ATOMIC_ACQ_REL 0
-#define __ATOMIC_RELAXED 1
-#define __atomic_add_fetch(p, val, memorder) (*(p) = *(p) + (val))
-#define __atomic_store_n(p, val, memorder) (*(p) = (val))
-#endif
-
-/* Get actual <rte_mbuf.h> definitions for us to annotate and build on. */
-#include_next <rte_mbuf.h>
diff --git a/include/sparse/rte_trace_point.h b/include/sparse/rte_trace_point.h
deleted file mode 100644
index 80392327543..00000000000
--- a/include/sparse/rte_trace_point.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2020, Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __CHECKER__
-#error "Use this header only with sparse.  It is not a correct implementation."
-#endif
-
-/* sparse doesn't know about gcc atomic builtins. */
-#ifndef __ATOMIC_ACQUIRE
-#define __ATOMIC_ACQUIRE 0
-#define __atomic_load_n(p, memorder) *(p)
-#endif
-
-/* Get actual <rte_trace_point.h> definitions for us to annotate and
- * build on. */
-#include_next <rte_trace_point.h>