diff --git a/x86/aes-decrypt.asm b/x86/aes-decrypt.asm
index f792b247228fa75dd58c7f634984a6da7f5ff829..5e5c2fcfe37edc39c66444272cd0d892bcada9c7 100644
--- a/x86/aes-decrypt.asm
+++ b/x86/aes-decrypt.asm
@@ -20,13 +20,13 @@ C MA 02111-1307, USA.
 	.file "aes-decrypt.asm"
 
 	C aes_decrypt(struct aes_context *ctx, 
-	C             unsigned length, uint8_t *dst,
-	C 	      uint8_t *src)
+	C	      unsigned length, uint8_t *dst,
+	C	      uint8_t *src)
 	.text
 	.align 16
-	.globl nettle_aes_decrypt
-	.type  nettle_aes_decrypt,@function
-nettle_aes_decrypt:
+	.globl C_NAME(nettle_aes_decrypt)
+	.type  C_NAME(nettle_aes_decrypt),@function
+C_NAME(nettle_aes_decrypt):
 	C save all registers that need to be saved
 	pushl	%ebx		C  16(%esp)
 	pushl	%ebp		C  12(%esp)
@@ -59,16 +59,16 @@ nettle_aes_decrypt:
 	C In these patterns, note that each row, like
 	C "a,d,c,b" corresponds to one *column* of the 
 	C array _aes_decrypt_table.idx.
-	AES_ROUND(_nettle_aes_decrypt_table,a,d,c,b)
+	AES_ROUND(C_NAME(_nettle_aes_decrypt_table),a,d,c,b)
 	pushl	%edi		C  save first on stack
 
-	AES_ROUND(_nettle_aes_decrypt_table,b,a,d,c)
+	AES_ROUND(C_NAME(_nettle_aes_decrypt_table),b,a,d,c)
 	pushl	%edi
 
-	AES_ROUND(_nettle_aes_decrypt_table,c,b,a,d)
+	AES_ROUND(C_NAME(_nettle_aes_decrypt_table),c,b,a,d)
 	pushl	%edi		C  save first on stack
 
-	AES_ROUND(_nettle_aes_decrypt_table,d,c,b,a)
+	AES_ROUND(C_NAME(_nettle_aes_decrypt_table),d,c,b,a)
 
 	movl	%edi,%edx
 	popl	%ecx
@@ -129,4 +129,4 @@ nettle_aes_decrypt:
 	popl	%ebx
 	ret
 .Leord:
-	.size	nettle_aes_decrypt,.Leord-nettle_aes_decrypt
+	.size	C_NAME(nettle_aes_decrypt),.Leord-C_NAME(nettle_aes_decrypt)
diff --git a/x86/aes-encrypt.asm b/x86/aes-encrypt.asm
index 19ae0526148f75572c28a845f21f052d9607b5ad..346ddf5cf20a57133964bc3df3a138cbcebbe8db 100644
--- a/x86/aes-encrypt.asm
+++ b/x86/aes-encrypt.asm
@@ -31,13 +31,13 @@ C %edi is a temporary, often used as an accumulator.
 	.file "aes-encrypt.asm"
 	
 	C aes_encrypt(struct aes_context *ctx, 
-	C             unsigned length, uint8_t *dst,
-	C 	      uint8_t *src)
+	C	      unsigned length, uint8_t *dst,
+	C	      uint8_t *src)
 	.text
 	.align 16
-	.globl nettle_aes_encrypt
-	.type  nettle_aes_encrypt,@function
-nettle_aes_encrypt:
+	.globl C_NAME(nettle_aes_encrypt)
+	.type  C_NAME(nettle_aes_encrypt),@function
+C_NAME(nettle_aes_encrypt):
 	C save all registers that need to be saved
 	pushl	%ebx		C  16(%esp)
 	pushl	%ebp		C  12(%esp)
@@ -67,16 +67,16 @@ nettle_aes_encrypt:
 .Lround_loop:
 	pushl	%esi		C  save this first: we'll clobber it later
 
-	AES_ROUND(_nettle_aes_encrypt_table,a,b,c,d)
+	AES_ROUND(C_NAME(_nettle_aes_encrypt_table),a,b,c,d)
 	pushl	%edi		C  save first on stack
 
-	AES_ROUND(_nettle_aes_encrypt_table,b,c,d,a)
+	AES_ROUND(C_NAME(_nettle_aes_encrypt_table),b,c,d,a)
 	pushl	%edi		C  save first on stack
 
-	AES_ROUND(_nettle_aes_encrypt_table,c,d,a,b)
+	AES_ROUND(C_NAME(_nettle_aes_encrypt_table),c,d,a,b)
 	pushl	%edi		C  save first on stack
 
-	AES_ROUND(_nettle_aes_encrypt_table,d,a,b,c)
+	AES_ROUND(C_NAME(_nettle_aes_encrypt_table),d,a,b,c)
 	
 	movl	%edi,%edx
 	popl	%ecx
@@ -114,7 +114,7 @@ nettle_aes_encrypt:
 	C S-box substitution
 	mov	$4,%edi
 .Lsubst:
-	AES_SUBST_BYTE(_nettle_aes_encrypt_table)
+	AES_SUBST_BYTE(C_NAME(_nettle_aes_encrypt_table))
 
 	decl	%edi
 	jnz	.Lsubst
@@ -137,4 +137,4 @@ nettle_aes_encrypt:
 	popl	%ebx
 	ret
 .Leord:
-	.size	nettle_aes_encrypt,.Leord-nettle_aes_encrypt
+	.size	C_NAME(nettle_aes_encrypt),.Leord-C_NAME(nettle_aes_encrypt)
diff --git a/x86/arcfour-crypt.asm b/x86/arcfour-crypt.asm
index ee1e23e0f6476390d22e495d2a96c982192c8586..7f97640620833f1d60d56bbd631f28d1827ec550 100644
--- a/x86/arcfour-crypt.asm
+++ b/x86/arcfour-crypt.asm
@@ -24,9 +24,9 @@ C MA 02111-1307, USA.
 	C               const uint8_t *src)
 	.text
 	.align 16
-	.globl nettle_arcfour_crypt
-	.type  nettle_arcfour_crypt,@function
-nettle_arcfour_crypt:
+	.globl C_NAME(nettle_arcfour_crypt)
+	.type  C_NAME(nettle_arcfour_crypt),@function
+C_NAME(nettle_arcfour_crypt):
 	C save all registers that need to be saved
 	pushl	%ebx		C  12(%esp)
 	pushl	%ebp		C  8(%esp)
@@ -91,4 +91,4 @@ C	andl	$0xff, %ebx
 	popl	%ebx
 	ret
 .Leord:
-	.size	nettle_arcfour_crypt,.Leord-nettle_arcfour_crypt
+	.size	C_NAME(nettle_arcfour_crypt),.Leord-C_NAME(nettle_arcfour_crypt)
diff --git a/x86/sha1-compress.asm b/x86/sha1-compress.asm
index b5b135cc427685a77e27468942ff0ff0fc8c6f28..27a1e22408c22476f7440d6f5b544a90f94009e4 100644
--- a/x86/sha1-compress.asm
+++ b/x86/sha1-compress.asm
@@ -113,9 +113,9 @@ define(<ROUND>, <
 	
 	.text
 	.align 16
-	.globl _nettle_sha1_compress
-	.type  _nettle_sha1_compress,@function
-_nettle_sha1_compress:
+	.globl C_NAME(_nettle_sha1_compress)
+	.type  C_NAME(_nettle_sha1_compress),@function
+C_NAME(_nettle_sha1_compress):
 	C save all registers that need to be saved
 	
 	pushl	%ebx		C  20(%esp)