diff -urpN JohnTheRipper-unstable-jumbo.orig/src/cuda_pwsafe_fmt.c JohnTheRipper-unstable-jumbo/src/cuda_pwsafe_fmt.c
--- JohnTheRipper-unstable-jumbo.orig/src/cuda_pwsafe_fmt.c	2013-01-16 03:50:38.299150072 +0000
+++ JohnTheRipper-unstable-jumbo/src/cuda_pwsafe_fmt.c	2013-01-16 03:56:52.551160268 +0000
@@ -20,6 +20,7 @@
 #include "base64.h"
 #include "memory.h"
 #include "cuda_pwsafe.h"
+#include "cuda_common.h"
 #define FORMAT_LABEL            "pwsafe-cuda"
 #define FORMAT_NAME             "Password Safe SHA-256"
 #define ALGORITHM_NAME          "CUDA"
@@ -55,7 +56,7 @@ static void init(struct fmt_main *self)
         host_pass = mem_calloc(KEYS_PER_CRYPT * sizeof(pwsafe_pass));
         host_hash = mem_calloc(KEYS_PER_CRYPT * sizeof(pwsafe_hash));
         host_salt = mem_calloc(sizeof(pwsafe_salt));
-
+	cuda_init(cuda_gpu_id);
         atexit(done);
 }
 
diff -urpN JohnTheRipper-unstable-jumbo.orig/src/cuda_rawsha512_fmt.c JohnTheRipper-unstable-jumbo/src/cuda_rawsha512_fmt.c
--- JohnTheRipper-unstable-jumbo.orig/src/cuda_rawsha512_fmt.c	2013-01-16 03:50:38.299150072 +0000
+++ JohnTheRipper-unstable-jumbo/src/cuda_rawsha512_fmt.c	2013-01-16 03:59:09.199163876 +0000
@@ -20,6 +20,7 @@
 
 
 #include "cuda_rawsha512.h"
+#include "cuda_common.h"
 #include "arch.h"
 #include "params.h"
 #include "common.h"
@@ -72,6 +73,7 @@ static void init(struct fmt_main *self)
 	gkey = mem_calloc(MAX_KEYS_PER_CRYPT * sizeof(sha512_key));
 	ghash = mem_calloc(MAX_KEYS_PER_CRYPT * sizeof(sha512_hash));
 
+	cuda_init(cuda_gpu_id);
 	cuda_sha512_init();
 
 	atexit(done);
diff -urpN JohnTheRipper-unstable-jumbo.orig/src/cuda_xsha512_fmt.c JohnTheRipper-unstable-jumbo/src/cuda_xsha512_fmt.c
--- JohnTheRipper-unstable-jumbo.orig/src/cuda_xsha512_fmt.c	2013-01-16 03:50:38.299150072 +0000
+++ JohnTheRipper-unstable-jumbo/src/cuda_xsha512_fmt.c	2013-01-16 04:00:20.591166448 +0000
@@ -26,6 +26,7 @@
 #include "params.h"
 #include "common.h"
 #include "formats.h"
+#include "cuda_common.h"
 
 #define FORMAT_LABEL			"xsha512-cuda"
 #define FORMAT_NAME			"Mac OS X 10.7+ salted SHA-512"
@@ -86,6 +87,8 @@ static void init(struct fmt_main *self)
 	gkey = mem_calloc(MAX_KEYS_PER_CRYPT * sizeof(xsha512_key));
 	g_ext_key = mem_calloc(MAX_KEYS_PER_CRYPT * sizeof(xsha512_extend_key));
 	ghash = mem_calloc(MAX_KEYS_PER_CRYPT * sizeof(xsha512_hash));
+
+	cuda_init(cuda_gpu_id);
 	cuda_xsha512_init();
 	atexit(done);
 }