diff --git a/generate-darwin-source-and-headers.py b/generate-darwin-source-and-headers.py
index f7fc414b..0a19582d 100755
--- a/generate-darwin-source-and-headers.py
+++ b/generate-darwin-source-and-headers.py
@@ -17,7 +17,7 @@ class simulator_platform(Platform):
     version_min = '-miphoneos-version-min=7.0'
 
     prefix = "#ifdef __i386__\n\n"
-    suffix = "\n\n#endif"
+    suffix = "\n\n#endif\n"
     src_dir = 'x86'
     src_files = ['sysv.S', 'ffi.c', 'internal.h']
 
@@ -30,7 +30,7 @@ class simulator64_platform(Platform):
     version_min = '-miphoneos-version-min=7.0'
 
     prefix = "#ifdef __x86_64__\n\n"
-    suffix = "\n\n#endif"
+    suffix = "\n\n#endif\n"
     src_dir = 'x86'
     src_files = ['unix64.S', 'ffi64.c', 'ffiw64.c', 'win64.S', 'internal64.h', 'asmnames.h']
 
@@ -43,7 +43,7 @@ class device_platform(Platform):
     version_min = '-miphoneos-version-min=7.0'
 
     prefix = "#ifdef __arm__\n\n"
-    suffix = "\n\n#endif"
+    suffix = "\n\n#endif\n"
     src_dir = 'arm'
     src_files = ['sysv.S', 'ffi.c', 'internal.h']
 
@@ -56,7 +56,7 @@ class device64_platform(Platform):
     version_min = '-miphoneos-version-min=7.0'
 
     prefix = "#ifdef __arm64__\n\n"
-    suffix = "\n\n#endif"
+    suffix = "\n\n#endif\n"
     src_dir = 'aarch64'
     src_files = ['sysv.S', 'ffi.c', 'internal.h']
 
@@ -71,7 +71,7 @@ class desktop32_platform(Platform):
     src_files = ['sysv.S', 'ffi.c', 'internal.h']
 
     prefix = "#ifdef __i386__\n\n"
-    suffix = "\n\n#endif"
+    suffix = "\n\n#endif\n"
 
 
 class desktop64_platform(Platform):
@@ -82,7 +82,7 @@ class desktop64_platform(Platform):
     version_min = '-mmacosx-version-min=10.6'
 
     prefix = "#ifdef __x86_64__\n\n"
-    suffix = "\n\n#endif"
+    suffix = "\n\n#endif\n"
     src_dir = 'x86'
     src_files = ['unix64.S', 'ffi64.c', 'ffiw64.c', 'win64.S', 'internal64.h', 'asmnames.h']
 
diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S
index d12bf27b..99ab1774 100644
--- a/src/aarch64/sysv.S
+++ b/src/aarch64/sysv.S
@@ -198,6 +198,7 @@ CNAME(ffi_call_SYSV):
 	cfi_endproc
 
 	.globl	CNAME(ffi_call_SYSV)
+	.private_extern CNAME(ffi_call_SYSV)
 #ifdef __ELF__
 	.type	CNAME(ffi_call_SYSV), #function
 	.hidden	CNAME(ffi_call_SYSV)
@@ -237,6 +238,7 @@ CNAME(ffi_closure_SYSV_V):
 	cfi_endproc
 
 	.globl	CNAME(ffi_closure_SYSV_V)
+	.private_extern CNAME(ffi_closure_SYSV_V)
 #ifdef __ELF__
 	.type	CNAME(ffi_closure_SYSV_V), #function
 	.hidden	CNAME(ffi_closure_SYSV_V)
@@ -349,6 +351,7 @@ CNAME(ffi_closure_SYSV):
 	cfi_endproc
 
 	.globl	CNAME(ffi_closure_SYSV)
+	.private_extern CNAME(ffi_closure_SYSV)
 #ifdef __ELF__
 	.type	CNAME(ffi_closure_SYSV), #function
 	.hidden	CNAME(ffi_closure_SYSV)
@@ -369,6 +372,7 @@ CNAME(ffi_closure_trampoline_table_page):
     .endr
 
     .globl CNAME(ffi_closure_trampoline_table_page)
+    .private_extern CNAME(ffi_closure_trampoline_table_page)
     #ifdef __ELF__
     	.type	CNAME(ffi_closure_trampoline_table_page), #function
     	.hidden	CNAME(ffi_closure_trampoline_table_page)
@@ -396,6 +400,7 @@ CNAME(ffi_go_closure_SYSV_V):
 	cfi_endproc
 
 	.globl	CNAME(ffi_go_closure_SYSV_V)
+	.private_extern CNAME(ffi_go_closure_SYSV_V)
 #ifdef __ELF__
 	.type	CNAME(ffi_go_closure_SYSV_V), #function
 	.hidden	CNAME(ffi_go_closure_SYSV_V)
@@ -425,6 +430,7 @@ CNAME(ffi_go_closure_SYSV):
 	cfi_endproc
 
 	.globl	CNAME(ffi_go_closure_SYSV)
+	.private_extern CNAME(ffi_go_closure_SYSV)
 #ifdef __ELF__
 	.type	CNAME(ffi_go_closure_SYSV), #function
 	.hidden	CNAME(ffi_go_closure_SYSV)
diff --git a/src/x86/sysv.S b/src/x86/sysv.S
index 27379a48..2ce6c9ad 100644
--- a/src/x86/sysv.S
+++ b/src/x86/sysv.S
@@ -76,6 +76,7 @@
 	.text
 	.balign	16
 	.globl	ffi_call_i386
+	.private_extern ffi_call_i386
 	FFI_HIDDEN(ffi_call_i386)
 
 /* This is declared as
@@ -292,6 +293,7 @@ L(C1(UW,UWN)):								\
 
 	.balign	16
 	.globl	C(ffi_go_closure_EAX)
+	.private_extern C(ffi_go_closure_EAX)
 	FFI_HIDDEN(C(ffi_go_closure_EAX))
 C(ffi_go_closure_EAX):
 L(UW6):
@@ -312,6 +314,7 @@ ENDF(C(ffi_go_closure_EAX))
 
 	.balign	16
 	.globl	C(ffi_go_closure_ECX)
+	.private_extern C(ffi_go_closure_ECX)
 	FFI_HIDDEN(C(ffi_go_closure_ECX))
 C(ffi_go_closure_ECX):
 L(UW9):
@@ -335,6 +338,7 @@ ENDF(C(ffi_go_closure_ECX))
 
 	.balign	16
 	.globl	C(ffi_closure_i386)
+	.private_extern C(ffi_closure_i386)
 	FFI_HIDDEN(C(ffi_closure_i386))
 
 C(ffi_closure_i386):
@@ -419,6 +423,7 @@ ENDF(C(ffi_closure_i386))
 
 	.balign	16
 	.globl	C(ffi_go_closure_STDCALL)
+	.private_extern C(ffi_go_closure_STDCALL)
 	FFI_HIDDEN(C(ffi_go_closure_STDCALL))
 C(ffi_go_closure_STDCALL):
 L(UW21):
@@ -442,6 +447,7 @@ ENDF(C(ffi_go_closure_STDCALL))
 
 	.balign	16
 	.globl	C(ffi_closure_REGISTER)
+	.private_extern C(ffi_closure_REGISTER)
 	FFI_HIDDEN(C(ffi_closure_REGISTER))
 C(ffi_closure_REGISTER):
 L(UW24):
@@ -466,6 +472,7 @@ ENDF(C(ffi_closure_REGISTER))
 
 	.balign	16
 	.globl	C(ffi_closure_STDCALL)
+	.private_extern C(ffi_closure_STDCALL)
 	FFI_HIDDEN(C(ffi_closure_STDCALL))
 C(ffi_closure_STDCALL):
 L(UW27):
@@ -572,6 +579,7 @@ ENDF(C(ffi_closure_STDCALL))
 
 	.balign	16
 	.globl	C(ffi_closure_raw_SYSV)
+	.private_extern C(ffi_closure_raw_SYSV)
 	FFI_HIDDEN(C(ffi_closure_raw_SYSV))
 C(ffi_closure_raw_SYSV):
 L(UW32):
@@ -675,6 +683,7 @@ ENDF(C(ffi_closure_raw_SYSV))
 
 	.balign	16
 	.globl	C(ffi_closure_raw_THISCALL)
+	.private_extern C(ffi_closure_raw_THISCALL)
 	FFI_HIDDEN(C(ffi_closure_raw_THISCALL))
 C(ffi_closure_raw_THISCALL):
 L(UW41):
diff --git a/src/x86/unix64.S b/src/x86/unix64.S
index db792c0d..fd669f9f 100644
--- a/src/x86/unix64.S
+++ b/src/x86/unix64.S
@@ -54,6 +54,7 @@
 
 	.balign	8
 	.globl	C(ffi_call_unix64)
+	.private_extern C(ffi_call_unix64)
 	FFI_HIDDEN(C(ffi_call_unix64))
 
 C(ffi_call_unix64):
@@ -223,6 +224,7 @@ ENDF(C(ffi_call_unix64))
 
 	.balign	2
 	.globl	C(ffi_closure_unix64_sse)
+	.private_extern C(ffi_closure_unix64_sse)
 	FFI_HIDDEN(C(ffi_closure_unix64_sse))
 
 C(ffi_closure_unix64_sse):
@@ -246,6 +248,7 @@ ENDF(C(ffi_closure_unix64_sse))
 
 	.balign	2
 	.globl	C(ffi_closure_unix64)
+	.private_extern C(ffi_closure_unix64)
 	FFI_HIDDEN(C(ffi_closure_unix64))
 
 C(ffi_closure_unix64):
@@ -354,6 +357,7 @@ ENDF(C(ffi_closure_unix64))
 
 	.balign	2
 	.globl	C(ffi_go_closure_unix64_sse)
+	.private_extern C(ffi_go_closure_unix64_sse)
 	FFI_HIDDEN(C(ffi_go_closure_unix64_sse))
 
 C(ffi_go_closure_unix64_sse):
@@ -377,6 +381,7 @@ ENDF(C(ffi_go_closure_unix64_sse))
 
 	.balign	2
 	.globl	C(ffi_go_closure_unix64)
+	.private_extern C(ffi_go_closure_unix64)
 	FFI_HIDDEN(C(ffi_go_closure_unix64))
 
 C(ffi_go_closure_unix64):
diff --git a/src/x86/win64.S b/src/x86/win64.S
index 10991b4f..5e798d98 100644
--- a/src/x86/win64.S
+++ b/src/x86/win64.S
@@ -42,6 +42,7 @@
 
 	.align	8
 	.globl	C(ffi_call_win64)
+	.private_extern C(ffi_call_win64)
 
 	SEH(.seh_proc ffi_call_win64)
 C(ffi_call_win64):
@@ -169,6 +170,7 @@ E(0b, FFI_TYPE_SMALL_STRUCT_4B)
 
 	.align	8
 	.globl	C(ffi_go_closure_win64)
+	.private_extern C(ffi_go_closure_win64)
 
 	SEH(.seh_proc ffi_go_closure_win64)
 C(ffi_go_closure_win64):
@@ -188,6 +190,7 @@ C(ffi_go_closure_win64):
 
 	.align	8
 	.globl	C(ffi_closure_win64)
+	.private_extern C(ffi_closure_win64)
 
 	SEH(.seh_proc ffi_closure_win64)
 C(ffi_closure_win64):