diff --git a/qemu/aarch64.h b/qemu/aarch64.h
index 29783f35..a7473ab2 100644
--- a/qemu/aarch64.h
+++ b/qemu/aarch64.h
@@ -1357,7 +1357,6 @@
 #define get_phys_addr_v5 get_phys_addr_v5_aarch64
 #define get_phys_addr_v6 get_phys_addr_v6_aarch64
 #define get_system_memory get_system_memory_aarch64
-#define get_ticks_per_sec get_ticks_per_sec_aarch64
 #define g_list_insert_sorted_merged g_list_insert_sorted_merged_aarch64
 #define _GLOBAL_OFFSET_TABLE_ _GLOBAL_OFFSET_TABLE__aarch64
 #define gt_cntfrq_access gt_cntfrq_access_aarch64
diff --git a/qemu/aarch64eb.h b/qemu/aarch64eb.h
index 880fc9cc..e1ba8e03 100644
--- a/qemu/aarch64eb.h
+++ b/qemu/aarch64eb.h
@@ -1357,7 +1357,6 @@
 #define get_phys_addr_v5 get_phys_addr_v5_aarch64eb
 #define get_phys_addr_v6 get_phys_addr_v6_aarch64eb
 #define get_system_memory get_system_memory_aarch64eb
-#define get_ticks_per_sec get_ticks_per_sec_aarch64eb
 #define g_list_insert_sorted_merged g_list_insert_sorted_merged_aarch64eb
 #define _GLOBAL_OFFSET_TABLE_ _GLOBAL_OFFSET_TABLE__aarch64eb
 #define gt_cntfrq_access gt_cntfrq_access_aarch64eb
diff --git a/qemu/arm.h b/qemu/arm.h
index 01131bf1..e34f8f1e 100644
--- a/qemu/arm.h
+++ b/qemu/arm.h
@@ -1357,7 +1357,6 @@
 #define get_phys_addr_v5 get_phys_addr_v5_arm
 #define get_phys_addr_v6 get_phys_addr_v6_arm
 #define get_system_memory get_system_memory_arm
-#define get_ticks_per_sec get_ticks_per_sec_arm
 #define g_list_insert_sorted_merged g_list_insert_sorted_merged_arm
 #define _GLOBAL_OFFSET_TABLE_ _GLOBAL_OFFSET_TABLE__arm
 #define gt_cntfrq_access gt_cntfrq_access_arm
diff --git a/qemu/armeb.h b/qemu/armeb.h
index 6b5a2310..b782cd05 100644
--- a/qemu/armeb.h
+++ b/qemu/armeb.h
@@ -1357,7 +1357,6 @@
 #define get_phys_addr_v5 get_phys_addr_v5_armeb
 #define get_phys_addr_v6 get_phys_addr_v6_armeb
 #define get_system_memory get_system_memory_armeb
-#define get_ticks_per_sec get_ticks_per_sec_armeb
 #define g_list_insert_sorted_merged g_list_insert_sorted_merged_armeb
 #define _GLOBAL_OFFSET_TABLE_ _GLOBAL_OFFSET_TABLE__armeb
 #define gt_cntfrq_access gt_cntfrq_access_armeb
diff --git a/qemu/header_gen.py b/qemu/header_gen.py
index b65530e3..13084889 100644
--- a/qemu/header_gen.py
+++ b/qemu/header_gen.py
@@ -1363,7 +1363,6 @@ symbols = (
     'get_phys_addr_v5',
     'get_phys_addr_v6',
     'get_system_memory',
-    'get_ticks_per_sec',
     'g_list_insert_sorted_merged',
     '_GLOBAL_OFFSET_TABLE_',
     'gt_cntfrq_access',
diff --git a/qemu/hw/mips/cputimer.c b/qemu/hw/mips/cputimer.c
index 71d28815..1ffa418d 100644
--- a/qemu/hw/mips/cputimer.c
+++ b/qemu/hw/mips/cputimer.c
@@ -50,8 +50,8 @@ static void cpu_mips_timer_update(CPUMIPSState *env)
 
     now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
     wait = env->CP0_Compare - env->CP0_Count -
-        (uint32_t)muldiv64(now, TIMER_FREQ, get_ticks_per_sec());
-    next = now + muldiv64(wait, get_ticks_per_sec(), TIMER_FREQ);
+        (uint32_t)muldiv64(now, TIMER_FREQ, NANOSECONDS_PER_SECOND);
+    next = now + muldiv64(wait, NANOSECONDS_PER_SECOND, TIMER_FREQ);
     timer_mod(env->timer, next);
 #endif
 }
@@ -83,7 +83,7 @@ uint32_t cpu_mips_get_count (CPUMIPSState *env)
         //}
 
         return env->CP0_Count +
-            (uint32_t)muldiv64(now, TIMER_FREQ, get_ticks_per_sec());
+            (uint32_t)muldiv64(now, TIMER_FREQ, NANOSECONDS_PER_SECOND);
     }
 }
 
@@ -101,7 +101,7 @@ void cpu_mips_store_count (CPUMIPSState *env, uint32_t count)
         /* Store new count register */
         env->CP0_Count =
             count - (uint32_t)muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL),
-                                       TIMER_FREQ, get_ticks_per_sec());
+                                       TIMER_FREQ, NANOSECONDS_PER_SECOND);
         /* Update timer timer */
         cpu_mips_timer_update(env);
     }
@@ -127,5 +127,5 @@ void cpu_mips_stop_count(CPUMIPSState *env)
 {
     /* Store the current value */
     env->CP0_Count += (uint32_t)muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL),
-                                         TIMER_FREQ, get_ticks_per_sec());
+                                         TIMER_FREQ, NANOSECONDS_PER_SECOND);
 }
diff --git a/qemu/include/qemu/timer.h b/qemu/include/qemu/timer.h
index 6b813711..f4e9af81 100644
--- a/qemu/include/qemu/timer.h
+++ b/qemu/include/qemu/timer.h
@@ -5,6 +5,8 @@
 #include "qemu-common.h"
 #include "qemu/host-utils.h"
 
+#define NANOSECONDS_PER_SECOND 1000000000LL
+
 /* timers */
 
 #define SCALE_MS 1000000
@@ -149,11 +151,6 @@ void cpu_enable_ticks(void);
 /* Caller must hold BQL */
 void cpu_disable_ticks(void);
 
-static inline int64_t get_ticks_per_sec(void)
-{
-    return 1000000000LL;
-}
-
 /*
  * Low level clock functions
  */
@@ -177,7 +174,7 @@ static inline int64_t get_clock(void)
 {
     LARGE_INTEGER ti;
     QueryPerformanceCounter(&ti);
-    return muldiv64(ti.QuadPart, (uint32_t)get_ticks_per_sec(), (uint32_t)clock_freq);
+    return muldiv64(ti.QuadPart, (uint32_t)NANOSECONDS_PER_SECOND, (uint32_t)clock_freq);
 }
 
 #else
diff --git a/qemu/m68k.h b/qemu/m68k.h
index e615a0bc..dee000c3 100644
--- a/qemu/m68k.h
+++ b/qemu/m68k.h
@@ -1357,7 +1357,6 @@
 #define get_phys_addr_v5 get_phys_addr_v5_m68k
 #define get_phys_addr_v6 get_phys_addr_v6_m68k
 #define get_system_memory get_system_memory_m68k
-#define get_ticks_per_sec get_ticks_per_sec_m68k
 #define g_list_insert_sorted_merged g_list_insert_sorted_merged_m68k
 #define _GLOBAL_OFFSET_TABLE_ _GLOBAL_OFFSET_TABLE__m68k
 #define gt_cntfrq_access gt_cntfrq_access_m68k
diff --git a/qemu/mips.h b/qemu/mips.h
index 0e57d03d..97f66c7c 100644
--- a/qemu/mips.h
+++ b/qemu/mips.h
@@ -1357,7 +1357,6 @@
 #define get_phys_addr_v5 get_phys_addr_v5_mips
 #define get_phys_addr_v6 get_phys_addr_v6_mips
 #define get_system_memory get_system_memory_mips
-#define get_ticks_per_sec get_ticks_per_sec_mips
 #define g_list_insert_sorted_merged g_list_insert_sorted_merged_mips
 #define _GLOBAL_OFFSET_TABLE_ _GLOBAL_OFFSET_TABLE__mips
 #define gt_cntfrq_access gt_cntfrq_access_mips
diff --git a/qemu/mips64.h b/qemu/mips64.h
index 36d34c71..53a7988a 100644
--- a/qemu/mips64.h
+++ b/qemu/mips64.h
@@ -1357,7 +1357,6 @@
 #define get_phys_addr_v5 get_phys_addr_v5_mips64
 #define get_phys_addr_v6 get_phys_addr_v6_mips64
 #define get_system_memory get_system_memory_mips64
-#define get_ticks_per_sec get_ticks_per_sec_mips64
 #define g_list_insert_sorted_merged g_list_insert_sorted_merged_mips64
 #define _GLOBAL_OFFSET_TABLE_ _GLOBAL_OFFSET_TABLE__mips64
 #define gt_cntfrq_access gt_cntfrq_access_mips64
diff --git a/qemu/mips64el.h b/qemu/mips64el.h
index 443f9369..833b20f7 100644
--- a/qemu/mips64el.h
+++ b/qemu/mips64el.h
@@ -1357,7 +1357,6 @@
 #define get_phys_addr_v5 get_phys_addr_v5_mips64el
 #define get_phys_addr_v6 get_phys_addr_v6_mips64el
 #define get_system_memory get_system_memory_mips64el
-#define get_ticks_per_sec get_ticks_per_sec_mips64el
 #define g_list_insert_sorted_merged g_list_insert_sorted_merged_mips64el
 #define _GLOBAL_OFFSET_TABLE_ _GLOBAL_OFFSET_TABLE__mips64el
 #define gt_cntfrq_access gt_cntfrq_access_mips64el
diff --git a/qemu/mipsel.h b/qemu/mipsel.h
index f162de00..8530c6a2 100644
--- a/qemu/mipsel.h
+++ b/qemu/mipsel.h
@@ -1357,7 +1357,6 @@
 #define get_phys_addr_v5 get_phys_addr_v5_mipsel
 #define get_phys_addr_v6 get_phys_addr_v6_mipsel
 #define get_system_memory get_system_memory_mipsel
-#define get_ticks_per_sec get_ticks_per_sec_mipsel
 #define g_list_insert_sorted_merged g_list_insert_sorted_merged_mipsel
 #define _GLOBAL_OFFSET_TABLE_ _GLOBAL_OFFSET_TABLE__mipsel
 #define gt_cntfrq_access gt_cntfrq_access_mipsel
diff --git a/qemu/powerpc.h b/qemu/powerpc.h
index bb108012..95c0ec1e 100644
--- a/qemu/powerpc.h
+++ b/qemu/powerpc.h
@@ -1357,7 +1357,6 @@
 #define get_phys_addr_v5 get_phys_addr_v5_powerpc
 #define get_phys_addr_v6 get_phys_addr_v6_powerpc
 #define get_system_memory get_system_memory_powerpc
-#define get_ticks_per_sec get_ticks_per_sec_powerpc
 #define g_list_insert_sorted_merged g_list_insert_sorted_merged_powerpc
 #define _GLOBAL_OFFSET_TABLE_ _GLOBAL_OFFSET_TABLE__powerpc
 #define gt_cntfrq_access gt_cntfrq_access_powerpc
diff --git a/qemu/sparc.h b/qemu/sparc.h
index 54d38bdf..fa8afddc 100644
--- a/qemu/sparc.h
+++ b/qemu/sparc.h
@@ -1357,7 +1357,6 @@
 #define get_phys_addr_v5 get_phys_addr_v5_sparc
 #define get_phys_addr_v6 get_phys_addr_v6_sparc
 #define get_system_memory get_system_memory_sparc
-#define get_ticks_per_sec get_ticks_per_sec_sparc
 #define g_list_insert_sorted_merged g_list_insert_sorted_merged_sparc
 #define _GLOBAL_OFFSET_TABLE_ _GLOBAL_OFFSET_TABLE__sparc
 #define gt_cntfrq_access gt_cntfrq_access_sparc
diff --git a/qemu/sparc64.h b/qemu/sparc64.h
index 2faf7524..a4027b88 100644
--- a/qemu/sparc64.h
+++ b/qemu/sparc64.h
@@ -1357,7 +1357,6 @@
 #define get_phys_addr_v5 get_phys_addr_v5_sparc64
 #define get_phys_addr_v6 get_phys_addr_v6_sparc64
 #define get_system_memory get_system_memory_sparc64
-#define get_ticks_per_sec get_ticks_per_sec_sparc64
 #define g_list_insert_sorted_merged g_list_insert_sorted_merged_sparc64
 #define _GLOBAL_OFFSET_TABLE_ _GLOBAL_OFFSET_TABLE__sparc64
 #define gt_cntfrq_access gt_cntfrq_access_sparc64
diff --git a/qemu/target-arm/helper.c b/qemu/target-arm/helper.c
index 1b371d1f..99659821 100644
--- a/qemu/target-arm/helper.c
+++ b/qemu/target-arm/helper.c
@@ -714,7 +714,7 @@ void pmccntr_sync(CPUARMState *env)
     uint64_t temp_ticks;
 
     temp_ticks = muldiv64(qemu_clock_get_us(QEMU_CLOCK_VIRTUAL),
-                          get_ticks_per_sec(), 1000000);
+                          NANOSECONDS_PER_SECOND, 1000000);
 
     if (env->cp15.c9_pmcr & PMCRD) {
         /* Increment once every 64 processor clock cycles */
@@ -753,7 +753,7 @@ static uint64_t pmccntr_read(CPUARMState *env, const ARMCPRegInfo *ri)
     }
 
     total_ticks = muldiv64(qemu_clock_get_us(QEMU_CLOCK_VIRTUAL),
-                           get_ticks_per_sec(), 1000000);
+                           NANOSECONDS_PER_SECOND, 1000000);
 
     if (env->cp15.c9_pmcr & PMCRD) {
         /* Increment once every 64 processor clock cycles */
@@ -774,7 +774,7 @@ static void pmccntr_write(CPUARMState *env, const ARMCPRegInfo *ri,
     }
 
     total_ticks = muldiv64(qemu_clock_get_us(QEMU_CLOCK_VIRTUAL),
-                           get_ticks_per_sec(), 1000000);
+                           NANOSECONDS_PER_SECOND, 1000000);
 
     if (env->cp15.c9_pmcr & PMCRD) {
         /* Increment once every 64 processor clock cycles */
diff --git a/qemu/x86_64.h b/qemu/x86_64.h
index 4c7de858..faf59772 100644
--- a/qemu/x86_64.h
+++ b/qemu/x86_64.h
@@ -1357,7 +1357,6 @@
 #define get_phys_addr_v5 get_phys_addr_v5_x86_64
 #define get_phys_addr_v6 get_phys_addr_v6_x86_64
 #define get_system_memory get_system_memory_x86_64
-#define get_ticks_per_sec get_ticks_per_sec_x86_64
 #define g_list_insert_sorted_merged g_list_insert_sorted_merged_x86_64
 #define _GLOBAL_OFFSET_TABLE_ _GLOBAL_OFFSET_TABLE__x86_64
 #define gt_cntfrq_access gt_cntfrq_access_x86_64