diff --git a/src/sljit/sljitConfigInternal.h b/src/sljit/sljitConfigInternal.h
index c81b6a4..049ed2f 100644
--- a/src/sljit/sljitConfigInternal.h
+++ b/src/sljit/sljitConfigInternal.h
@@ -297,6 +297,7 @@ extern "C" {
 /* Type of public API functions. */
 /*********************************/
 
+#ifndef SLJIT_API_FUNC_ATTRIBUTE 
 #if (defined SLJIT_CONFIG_STATIC && SLJIT_CONFIG_STATIC)
 /* Static ABI functions. For all-in-one programs. */
 
@@ -310,6 +311,7 @@ extern "C" {
 #else
 #define SLJIT_API_FUNC_ATTRIBUTE
 #endif /* (defined SLJIT_CONFIG_STATIC && SLJIT_CONFIG_STATIC) */
+#endif /* defined SLJIT_API_FUNC_ATTRIBUTE */
 
 /****************************/
 /* Instruction cache flush. */
diff --git a/src/sljit/sljitNativeX86_common.c b/src/sljit/sljitNativeX86_common.c
index eea9510..9ced936 100644
--- a/src/sljit/sljitNativeX86_common.c
+++ b/src/sljit/sljitNativeX86_common.c
@@ -726,7 +726,7 @@ static SLJIT_INLINE sljit_s32 emit_endbranch(struct sljit_compiler *compiler)
 	*inst = 0xfa;
 #endif
 #else
-	(void)compiler;
+	SLJIT_UNUSED_ARG(compiler);
 #endif
 	return SLJIT_SUCCESS;
 }
@@ -754,7 +754,8 @@ static SLJIT_INLINE sljit_s32 emit_rdssp(struct sljit_compiler *compiler, sljit_
 	*inst++ = 0x1e;
 	*inst = (0x3 << 6) | (0x1 << 3) | (reg_map[reg] & 0x7);
 #else
-	(void)compiler;
+	SLJIT_UNUSED_ARG(compiler);
+	SLJIT_UNUSED_ARG(reg);
 #endif
 	return SLJIT_SUCCESS;
 }
@@ -782,7 +783,8 @@ static SLJIT_INLINE sljit_s32 emit_incssp(struct sljit_compiler *compiler, sljit
 	*inst++ = 0xae;
 	*inst = (0x3 << 6) | (0x5 << 3) | (reg_map[reg] & 0x7);
 #else
-	(void)compiler;
+	SLJIT_UNUSED_ARG(compiler);
+	SLJIT_UNUSED_ARG(reg);
 #endif
 	return SLJIT_SUCCESS;
 }
@@ -860,6 +862,10 @@ static SLJIT_INLINE sljit_s32 adjust_shadow_stack(struct sljit_compiler *compile
 	*jz_after_cmp_inst = compiler->size - size_jz_after_cmp_inst;
 #else /* SLJIT_CONFIG_X86_CET */
 	SLJIT_UNUSED_ARG(compiler);
+	SLJIT_UNUSED_ARG(src);
+	SLJIT_UNUSED_ARG(srcw);
+	SLJIT_UNUSED_ARG(base);
+	SLJIT_UNUSED_ARG(disp);
 #endif /* SLJIT_CONFIG_X86_CET */
 	return SLJIT_SUCCESS;
 }
diff --git a/src/sljit/sljitUtils.c b/src/sljit/sljitUtils.c
index 972cad9..0276fa1 100644
--- a/src/sljit/sljitUtils.c
+++ b/src/sljit/sljitUtils.c
@@ -212,6 +212,8 @@ static SLJIT_INLINE sljit_s32 open_dev_zero(void)
 
 #endif /* SLJIT_UTIL_STACK || SLJIT_EXECUTABLE_ALLOCATOR */
 
+#endif /* SLJIT_EXECUTABLE_ALLOCATOR || SLJIT_UTIL_GLOBAL_LOCK */
+
 #if (defined SLJIT_UTIL_STACK && SLJIT_UTIL_STACK)
 
 #if (defined SLJIT_UTIL_SIMPLE_STACK_ALLOCATION && SLJIT_UTIL_SIMPLE_STACK_ALLOCATION)
@@ -406,5 +408,3 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_u8 *SLJIT_FUNC sljit_stack_resize(struct sljit_st
 #endif /* SLJIT_UTIL_SIMPLE_STACK_ALLOCATION */
 
 #endif /* SLJIT_UTIL_STACK */
-
-#endif