diff --git a/arch/x86_64/src/intel64/CMakeLists.txt b/arch/x86_64/src/intel64/CMakeLists.txt
index 4ad7f3e9f5..f36f46f06e 100644
--- a/arch/x86_64/src/intel64/CMakeLists.txt
+++ b/arch/x86_64/src/intel64/CMakeLists.txt
@@ -37,6 +37,7 @@ set(SRCS
     intel64_sigdeliver.c
     intel64_usestack.c
     intel64_systemreset.c
+    intel64_freq.c
     intel64_start.c
     intel64_handlers.c
     intel64_idle.c
diff --git a/arch/x86_64/src/intel64/Make.defs b/arch/x86_64/src/intel64/Make.defs
index 80b1ffd8f5..5e3b4f3b8e 100644
--- a/arch/x86_64/src/intel64/Make.defs
+++ b/arch/x86_64/src/intel64/Make.defs
@@ -34,7 +34,7 @@ CMN_CSRCS += intel64_map_region.c intel64_regdump.c intel64_releasestack.c
 CMN_CSRCS += intel64_rtc.c intel64_restore_auxstate.c intel64_savestate.c
 CMN_CSRCS += intel64_stackframe.c intel64_schedulesigaction.c
 CMN_CSRCS += intel64_sigdeliver.c intel64_usestack.c x86_64_tcbinfo.c
-CMN_CSRCS += intel64_systemreset.c
+CMN_CSRCS += intel64_systemreset.c intel64_freq.c
 
 # Required Intel64 files
 
diff --git a/boards/x86_64/intel64/qemu-intel64/src/qemu_freq.c b/arch/x86_64/src/intel64/intel64_freq.c
similarity index 98%
rename from boards/x86_64/intel64/qemu-intel64/src/qemu_freq.c
rename to arch/x86_64/src/intel64/intel64_freq.c
index 1a8c6a2eff..421daaa6ea 100644
--- a/boards/x86_64/intel64/qemu-intel64/src/qemu_freq.c
+++ b/arch/x86_64/src/intel64/intel64_freq.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/x86_64/intel64/qemu-intel64/src/qemu_freq.c
+ * arch/x86_64/src/intel64/intel64_freq.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/boards/x86_64/intel64/qemu-intel64/src/CMakeLists.txt b/boards/x86_64/intel64/qemu-intel64/src/CMakeLists.txt
index 84bd010323..9ea53ac0f9 100644
--- a/boards/x86_64/intel64/qemu-intel64/src/CMakeLists.txt
+++ b/boards/x86_64/intel64/qemu-intel64/src/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 # ##############################################################################
 
-set(SRCS qemu_boot.c qemu_bringup.c qemu_freq.c qemu_net.c)
+set(SRCS qemu_boot.c qemu_bringup.c qemu_net.c)
 
 if(CONFIG_BOARDCTL)
   list(APPEND SRCS qemu_appinit.c)
diff --git a/boards/x86_64/intel64/qemu-intel64/src/Makefile b/boards/x86_64/intel64/qemu-intel64/src/Makefile
index 837b79079a..41d7c4b173 100644
--- a/boards/x86_64/intel64/qemu-intel64/src/Makefile
+++ b/boards/x86_64/intel64/qemu-intel64/src/Makefile
@@ -20,7 +20,7 @@
 
 include $(TOPDIR)/Make.defs
 
-CSRCS = qemu_boot.c qemu_bringup.c qemu_freq.c qemu_net.c
+CSRCS = qemu_boot.c qemu_bringup.c qemu_net.c
 
 ifeq ($(CONFIG_BOARDCTL),y)
   CSRCS += qemu_appinit.c