diff --git a/README.md b/README.md
index 789aee3..93ba080 100644
--- a/README.md
+++ b/README.md
@@ -53,4 +53,4 @@ https://godoc.org/crawshaw.io/sqlite
 
 ## Platform specific considerations
 
-By default it requires some pthreads DLL on Windows. To avoid it, supply `CGOLDFLAGS="-static"` when building your application.
+By default it requires some pthreads DLL on Windows. To avoid it, supply `CGO_LDFLAGS="-static"` when building your application.
diff --git a/auth.go b/auth.go
index ec29a9c..22d31e7 100644
--- a/auth.go
+++ b/auth.go
@@ -2,10 +2,8 @@ package sqlite
 
 // #include <stdint.h>
 // #include <sqlite3.h>
-// extern int go_sqlite_auth_tramp(uintptr_t, int, char*, char*, char*, char*);
-// static int c_auth_tramp(void *userData, int action, const char* arg1, const char* arg2, const char* db, const char* trigger) {
-//   return go_sqlite_auth_tramp((uintptr_t)userData, action, (char*)arg1, (char*)arg2, (char*)db, (char*)trigger);
-// }
+// #include "wrappers.h"
+//
 // static int sqlite3_go_set_authorizer(sqlite3* conn, uintptr_t id) {
 //   return sqlite3_set_authorizer(conn, c_auth_tramp, (void*)id);
 // }
diff --git a/func.go b/func.go
index e080599..9acd6f4 100644
--- a/func.go
+++ b/func.go
@@ -19,10 +19,6 @@ package sqlite
 // #include <sqlite3.h>
 // #include "wrappers.h"
 //
-// extern void func_tramp(sqlite3_context*, int, sqlite3_value**);
-// extern void step_tramp(sqlite3_context*, int, sqlite3_value**);
-// extern void final_tramp(sqlite3_context*);
-//
 // static int go_sqlite3_create_function_v2(
 //   sqlite3 *db,
 //   const char *zFunctionName,
@@ -167,10 +163,10 @@ func (conn *Conn) CreateFunction(name string, deterministic bool, numArgs int, x
 
 	var funcfn, stepfn, finalfn *[0]byte
 	if xFunc == nil {
-		stepfn = (*[0]byte)(C.step_tramp)
-		finalfn = (*[0]byte)(C.final_tramp)
+		stepfn = (*[0]byte)(C.c_step_tramp)
+		finalfn = (*[0]byte)(C.c_final_tramp)
 	} else {
-		funcfn = (*[0]byte)(C.func_tramp)
+		funcfn = (*[0]byte)(C.c_func_tramp)
 	}
 
 	res := C.go_sqlite3_create_function_v2(
@@ -197,8 +193,8 @@ func getxfuncs(ctx *C.sqlite3_context) *xfunc {
 	return x
 }
 
-//export func_tramp
-func func_tramp(ctx *C.sqlite3_context, n C.int, valarray **C.sqlite3_value) {
+//export go_func_tramp
+func go_func_tramp(ctx *C.sqlite3_context, n C.int, valarray **C.sqlite3_value) {
 	x := getxfuncs(ctx)
 	var vals []Value
 	if n > 0 {
@@ -207,8 +203,8 @@ func func_tramp(ctx *C.sqlite3_context, n C.int, valarray **C.sqlite3_value) {
 	x.xFunc(Context{ptr: ctx}, vals...)
 }
 
-//export step_tramp
-func step_tramp(ctx *C.sqlite3_context, n C.int, valarray **C.sqlite3_value) {
+//export go_step_tramp
+func go_step_tramp(ctx *C.sqlite3_context, n C.int, valarray **C.sqlite3_value) {
 	x := getxfuncs(ctx)
 	var vals []Value
 	if n > 0 {
@@ -217,8 +213,8 @@ func step_tramp(ctx *C.sqlite3_context, n C.int, valarray **C.sqlite3_value) {
 	x.xStep(Context{ptr: ctx}, vals...)
 }
 
-//export final_tramp
-func final_tramp(ctx *C.sqlite3_context) {
+//export go_final_tramp
+func go_final_tramp(ctx *C.sqlite3_context) {
 	x := getxfuncs(ctx)
 	x.xFinal(Context{ptr: ctx})
 }
diff --git a/session.go b/session.go
index eecfb84..8d00978 100644
--- a/session.go
+++ b/session.go
@@ -19,9 +19,6 @@ package sqlite
 // #include <sqlite3.h>
 // #include "wrappers.h"
 //
-// extern int go_strm_w_tramp(uintptr_t, char*, int);
-// extern int go_strm_r_tramp(uintptr_t, char*, int*);
-//
 // static int go_sqlite3session_changeset_strm(
 //   sqlite3_session *pSession,
 //   int (*xOutput)(void *pOut, const void *pData, int nData),
diff --git a/sqlite.go b/sqlite.go
index 415eb30..76d212a 100644
--- a/sqlite.go
+++ b/sqlite.go
@@ -52,9 +52,8 @@ package sqlite
 //	return sqlite3_bind_blob(stmt, col, p, n, SQLITE_TRANSIENT);
 // }
 //
-// extern void log_fn(void* pArg, int code, char* msg);
 // static void enable_logging() {
-//	sqlite3_config(SQLITE_CONFIG_LOG, log_fn, NULL);
+//	sqlite3_config(SQLITE_CONFIG_LOG, c_log_fn, NULL);
 // }
 //
 // static int db_config_onoff(sqlite3* db, int op, int onoff) {
@@ -170,7 +169,6 @@ func openConn(path string, flags ...OpenFlags) (*Conn, error) {
 		}
 	}
 
-
 	return conn, nil
 }
 
@@ -1224,8 +1222,8 @@ func sqliteInitFn() {
 	}
 }
 
-//export log_fn
-func log_fn(_ unsafe.Pointer, code C.int, msg *C.char) {
+//export go_log_fn
+func go_log_fn(_ unsafe.Pointer, code C.int, msg *C.char) {
 	var msgBytes []byte
 	if msg != nil {
 		str := C.GoString(msg) // TODO: do not copy msg.
diff --git a/wrappers.c b/wrappers.c
index cbe5d3b..8177c58 100644
--- a/wrappers.c
+++ b/wrappers.c
@@ -42,8 +42,32 @@ int c_xapply_filter_tramp(void* pCtx, const char* zTab) {
         return go_xapply_filter_tramp((uintptr_t)pCtx, (char*)zTab);
 }
 
+extern void go_func_tramp(sqlite3_context*, int, sqlite3_value**);
+void c_func_tramp(sqlite3_context* ctx, int n, sqlite3_value** valarray) {
+        return go_func_tramp(ctx, n, valarray);
+}
+
+extern void go_step_tramp(sqlite3_context*, int, sqlite3_value**);
+void c_step_tramp(sqlite3_context* ctx, int n, sqlite3_value** valarray) {
+        return go_step_tramp(ctx, n, valarray);
+}
+
+extern void go_final_tramp(sqlite3_context*);
+void c_final_tramp(sqlite3_context* ctx) {
+        return go_final_tramp(ctx);
+}
+
 extern void go_destroy_tramp(uintptr_t);
 void c_destroy_tramp(void* ptr) {
         return go_destroy_tramp((uintptr_t)ptr);
 }
 
+extern int go_sqlite_auth_tramp(uintptr_t, int, char*, char*, char*, char*);
+int c_auth_tramp(void *userData, int action, const char* arg1, const char* arg2, const char* db, const char* trigger) {
+        return go_sqlite_auth_tramp((uintptr_t)userData, action, (char*)arg1, (char*)arg2, (char*)db, (char*)trigger);
+}
+
+extern void go_log_fn(void*, int, char*);
+void c_log_fn(void* pArg, int code, char* msg) {
+        return go_log_fn(pArg, code, msg);
+}
\ No newline at end of file
diff --git a/wrappers.h b/wrappers.h
index 4dc38fc..c3c90e7 100644
--- a/wrappers.h
+++ b/wrappers.h
@@ -26,6 +26,12 @@ int c_strm_r_tramp(void*, const void*, int*);
 int c_xapply_conflict_tramp(void*, int, sqlite3_changeset_iter*);
 int c_xapply_filter_tramp(void*, const char*);
 
+void c_log_fn(void*, int, char*);
+int c_auth_tramp(void*, int, const char*, const char*, const char*, const char*);
+
+void c_func_tramp(sqlite3_context*, int, sqlite3_value**);
+void c_step_tramp(sqlite3_context*, int, sqlite3_value**);
+void c_final_tramp(sqlite3_context*);
 void c_destroy_tramp(void*);
 
 #endif // WRAPPERS_H