diff --git a/include/i386/Makefile b/include/i386/Makefile
index de270655fb69..58c619f4dbdf 100644
--- a/include/i386/Makefile
+++ b/include/i386/Makefile
@@ -1,21 +1,22 @@
 # i386 headers installed on amd64
 
 .PATH: ${SRCTOP}/sys/i386/include
 INCS=	\
 	asm.h \
 	asmacros.h \
 	atomic.h \
 	cpufunc.h \
 	pmap.h \
 	proc.h \
 	profile.h \
 	segments.h \
 	vmparam.h
 # These kernel-only headers are used by procstat's ZFS support.
 # This should be fixed.
 INCS+=	\
+	counter.h \
 	pcpu.h \
 	pcpu_aux.h
 INCSDIR=	${INCLUDEDIR}/i386
 
 .include <bsd.prog.mk>
diff --git a/sys/amd64/include/counter.h b/sys/amd64/include/counter.h
index e7eb19e058cd..1d641a365e3f 100644
--- a/sys/amd64/include/counter.h
+++ b/sys/amd64/include/counter.h
@@ -1,92 +1,98 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 
+#ifdef __i386__
+#include <i386/counter.h>
+#else /* !__i386__ */
+
 #ifndef __MACHINE_COUNTER_H__
 #define __MACHINE_COUNTER_H__
 
 #include <sys/pcpu.h>
 
 #define	EARLY_COUNTER	(void *)__offsetof(struct pcpu, pc_early_dummy_counter)
 
 #define	counter_enter()	do {} while (0)
 #define	counter_exit()	do {} while (0)
 
 #ifdef IN_SUBR_COUNTER_C
 static inline uint64_t
 counter_u64_read_one(counter_u64_t c, int cpu)
 {
 
 	MPASS(c != EARLY_COUNTER);
 	return (*zpcpu_get_cpu(c, cpu));
 }
 
 static inline uint64_t
 counter_u64_fetch_inline(uint64_t *c)
 {
 	uint64_t r;
 	int cpu;
 
 	r = 0;
 	CPU_FOREACH(cpu)
 		r += counter_u64_read_one(c, cpu);
 
 	return (r);
 }
 
 static void
 counter_u64_zero_one_cpu(void *arg)
 {
 	counter_u64_t c;
 
 	c = arg;
 	MPASS(c != EARLY_COUNTER);
 	*(zpcpu_get(c)) = 0;
 }
 
 static inline void
 counter_u64_zero_inline(counter_u64_t c)
 {
 
 	smp_rendezvous(smp_no_rendezvous_barrier, counter_u64_zero_one_cpu,
 	    smp_no_rendezvous_barrier, c);
 }
 #endif
 
 #define	counter_u64_add_protected(c, i)	counter_u64_add(c, i)
 
 static inline void
 counter_u64_add(counter_u64_t c, int64_t inc)
 {
 
 	KASSERT(IS_BSP() || c != EARLY_COUNTER, ("EARLY_COUNTER used on AP"));
 	zpcpu_add(c, inc);
 }
 
 #endif	/* ! __MACHINE_COUNTER_H__ */
+
+#endif /* __i386__ */