diff --git a/src/mono/mono/mini/aot-runtime.c b/src/mono/mono/mini/aot-runtime.c
index 1c04902fcc8d25..cd7ff7bc4c8fb2 100644
--- a/src/mono/mono/mini/aot-runtime.c
+++ b/src/mono/mono/mini/aot-runtime.c
@@ -5644,7 +5644,6 @@ read_page_trampoline_uwinfo (MonoTrampInfo *info, int tramp_type, gboolean is_ge
 static unsigned char*
 get_new_trampoline_from_page (int tramp_type)
 {
-	MonoImage *image;
 	TrampolinePage *page;
 	int count;
 	void *tpage;
diff --git a/src/mono/mono/mini/simd-intrinsics-netcore.c b/src/mono/mono/mini/simd-intrinsics-netcore.c
index ea4c1a9574c02b..50f904bcd0fee3 100644
--- a/src/mono/mono/mini/simd-intrinsics-netcore.c
+++ b/src/mono/mono/mini/simd-intrinsics-netcore.c
@@ -4,6 +4,7 @@
 
 #include <config.h>
 #include <mono/utils/mono-compiler.h>
+#include "mini.h"
 
 #if defined(DISABLE_JIT)
 
@@ -18,7 +19,6 @@ mono_simd_intrinsics_init (void)
  * Only LLVM is supported as a backend.
  */
 
-#include "mini.h"
 #include "mini-runtime.h"
 #include "ir-emit.h"
 #ifdef ENABLE_LLVM
diff --git a/src/mono/mono/utils/mono-state.c b/src/mono/mono/utils/mono-state.c
index 717c88cfb07a9b..7333818f3a2a78 100644
--- a/src/mono/mono/utils/mono-state.c
+++ b/src/mono/mono/utils/mono-state.c
@@ -1202,22 +1202,6 @@ mono_crash_dump (const char *jsonFile, MonoStackHash *hashes)
 	return;
 }
 
-#endif // DISABLE_CRASH_REPORTING
-
-static volatile int32_t dump_status;
-
-gboolean
-mono_dump_start (void)
-{
-	return (mono_atomic_xchg_i32(&dump_status, 1) == 0);  // return true if we started the dump
-}
-
-gboolean
-mono_dump_complete (void)
-{
-	return (mono_atomic_xchg_i32(&dump_status, 0) == 1);  // return true if we completed the dump
-}
-
 static char *saved_failfast_msg;
 
 /**
@@ -1237,3 +1221,19 @@ mono_crash_get_failfast_msg (void)
 {
 	return saved_failfast_msg;
 }
+
+#endif // DISABLE_CRASH_REPORTING
+
+static volatile int32_t dump_status;
+
+gboolean
+mono_dump_start (void)
+{
+	return (mono_atomic_xchg_i32(&dump_status, 1) == 0);  // return true if we started the dump
+}
+
+gboolean
+mono_dump_complete (void)
+{
+	return (mono_atomic_xchg_i32(&dump_status, 0) == 1);  // return true if we completed the dump
+}