diff -urpN JohnTheRipper.orig/src/cracker.c JohnTheRipper/src/cracker.c
--- JohnTheRipper.orig/src/cracker.c	2013-01-13 03:20:27.324671778 +0000
+++ JohnTheRipper/src/cracker.c	2013-01-13 03:28:19.532670801 +0000
@@ -66,7 +66,7 @@ void crk_init(struct db_main *db, void (
 		error();
 	}
 
-#ifdef CL_VERSION_1_0
+#ifdef HAVE_OPENCL
 	/* This erases the 'spinning wheel' cursor from self-test */
 	fprintf(stderr, " \b");
 #endif
diff -urpN JohnTheRipper.orig/src/formats.c JohnTheRipper/src/formats.c
--- JohnTheRipper.orig/src/formats.c	2013-01-13 03:20:27.328671778 +0000
+++ JohnTheRipper/src/formats.c	2013-01-13 03:27:48.312670866 +0000
@@ -13,7 +13,7 @@
 #ifndef BENCH_BUILD
 #include "options.h"
 #endif
-#ifdef CL_VERSION_1_0
+#ifdef HAVE_OPENCL
 #include "common-opencl.h"
 #endif
 
@@ -188,7 +188,7 @@ char *fmt_self_test(struct fmt_main *for
 			}
 		}
 #endif
-#ifdef CL_VERSION_1_0
+#ifdef HAVE_OPENCL
 		advance_cursor();
 #endif
 #ifndef BENCH_BUILD
diff -urpN JohnTheRipper.orig/src/john.c JohnTheRipper/src/john.c
--- JohnTheRipper.orig/src/john.c	2013-01-13 03:20:27.332671778 +0000
+++ JohnTheRipper/src/john.c	2013-01-13 03:30:43.376670504 +0000
@@ -65,7 +65,7 @@
 #ifdef HAVE_GMP
 #include "gmp.h"
 #endif
-#ifdef CL_VERSION_1_0
+#ifdef HAVE_OPENCL
 #include "common-opencl.h"
 #endif
 #ifdef HAVE_CUDA
@@ -131,7 +131,7 @@ extern struct fmt_main fmt_krb5_18;
 #endif
 extern int hccap2john(int argc, char **argv);
 
-#ifdef CL_VERSION_1_0
+#ifdef HAVE_OPENCL
 extern struct fmt_main fmt_opencl_NSLDAPS;
 extern struct fmt_main fmt_opencl_rawMD4;
 extern struct fmt_main fmt_opencl_rawMD5;
@@ -296,7 +296,7 @@ static void john_register_all(void)
 	john_register_one(&fmt_zip);
 	john_register_one(&fmt_dummy);
 
-#ifdef CL_VERSION_1_0
+#ifdef HAVE_OPENCL
 	john_register_one(&fmt_opencl_NSLDAPS);
 	john_register_one(&fmt_opencl_rawMD4);
 	john_register_one(&fmt_opencl_rawMD5);
@@ -600,7 +600,7 @@ static void john_list_options()
 	// the resulting line will get too long
 	// printf("sections, parameters:SECTION, list-data:SECTION, ");
 	puts("sections, parameters:SECTION, list-data:SECTION,");
-#ifdef CL_VERSION_1_0
+#ifdef HAVE_OPENCL
 	printf("opencl-devices, ");
 #endif
 #ifdef HAVE_CUDA
@@ -799,7 +799,7 @@ static void john_init(char *name, int ar
 		listEncodings();
 		exit(0);
 	}
-#ifdef CL_VERSION_1_0
+#ifdef HAVE_OPENCL
 	if (options.listconf && !strcasecmp(options.listconf, "opencl-devices"))
 	{
 		listOpenCLdevices();
@@ -1176,7 +1176,7 @@ static void john_init(char *name, int ar
 		}
 	}
 
-#ifdef CL_VERSION_1_0
+#ifdef HAVE_OPENCL
 	if (!options.ocl_platform) {
 		if ((options.ocl_platform =
 		     cfg_get_param(SECTION_OPTIONS, SUBSECTION_OPENCL, "Platform")))
diff -urpN JohnTheRipper.orig/src/Makefile JohnTheRipper/src/Makefile
--- JohnTheRipper.orig/src/Makefile	2013-01-13 03:20:27.336671778 +0000
+++ JohnTheRipper/src/Makefile	2013-01-13 03:34:41.472670011 +0000
@@ -371,7 +371,7 @@ linux-x86-64-gpu:
 	@echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
 	$(MAKE) $(PROJ) \
 		JOHN_OBJS="$(JOHN_OBJS) $(OCL_OBJS) $(CUDA_OBJS) c3_fmt.o x86-64.o sse-intrinsics.o" \
-		CFLAGS="$(CFLAGS) -I$(OCLROOT)/include -DHAVE_CRYPT -DCL_VERSION_1_0 -DHAVE_CUDA -DHAVE_DL -march=native" \
+		CFLAGS="$(CFLAGS) -I$(OCLROOT)/include -DHAVE_CRYPT -DHAVE_OPENCL -DHAVE_CUDA -DHAVE_DL -march=native" \
 		ASFLAGS="$(ASFLAGS) -march=native" \
 		LDFLAGS="$(LDFLAGS) -L$(OCLROOT)/lib/x86_64 -L$(OCLROOT)/lib64 -L$(CUDA64PATH) -lcrypt -lOpenCL -ldl -lcudart -march=native"
 	$(MKDIR) ../run/kernels/
@@ -383,7 +383,7 @@ linux-x86-64-opencl:
 	@echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
 	$(MAKE) $(PROJ) \
 		JOHN_OBJS="$(JOHN_OBJS) $(OCL_OBJS) c3_fmt.o x86-64.o sse-intrinsics.o" \
-		CFLAGS="$(CFLAGS) -I$(OCLROOT)/include -DHAVE_CRYPT -DCL_VERSION_1_0 -DHAVE_DL -march=native" \
+		CFLAGS="$(CFLAGS) -I$(OCLROOT)/include -DHAVE_CRYPT -DHAVE_OPENCL -DHAVE_DL -march=native" \
 		ASFLAGS="$(ASFLAGS) -march=native" \
 		LDFLAGS="$(LDFLAGS) -L$(OCLROOT)/lib/x86_64 -L$(OCLROOT)/lib64 -lcrypt -lOpenCL -ldl -march=native"
 	$(MKDIR) ../run/kernels/
@@ -531,7 +531,7 @@ linux-x86-gpu:
 	@echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
 	$(MAKE) $(PROJ) \
 		JOHN_OBJS="$(JOHN_OBJS) $(OCL_OBJS) $(CUDA_OBJS) c3_fmt.o x86.o x86-sse.o sha1-mmx.o md4-mmx.o md5-mmx.o sse-intrinsics-32.o" \
-		CFLAGS="$(CFLAGS) -I$(OCLROOT)/include -DHAVE_CRYPT -DCL_VERSION_1_0 -DHAVE_CUDA -DHAVE_DL -DUSING_ICC_S_FILE" \
+		CFLAGS="$(CFLAGS) -I$(OCLROOT)/include -DHAVE_CRYPT -DHAVE_OPENCL -DHAVE_CUDA -DHAVE_DL -DUSING_ICC_S_FILE" \
 		LDFLAGS="$(LDFLAGS) -L$(OCLROOT)/lib/x86 -L$(OCLROOT)/lib -L$(CUDAPATH) -lcrypt -lOpenCL -ldl -lcudart"
 	$(MKDIR) ../run/kernels/
 	$(CP_PRESERVE) opencl/*.cl ../run/kernels/
@@ -542,7 +542,7 @@ linux-x86-opencl:
 	@echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
 	$(MAKE) $(PROJ) \
 		JOHN_OBJS="$(JOHN_OBJS) $(OCL_OBJS) c3_fmt.o x86.o x86-sse.o sha1-mmx.o md4-mmx.o md5-mmx.o sse-intrinsics-32.o" \
-		CFLAGS="$(CFLAGS) -I$(OCLROOT)/include -DHAVE_CRYPT -DCL_VERSION_1_0 -DHAVE_DL -DUSING_ICC_S_FILE" \
+		CFLAGS="$(CFLAGS) -I$(OCLROOT)/include -DHAVE_CRYPT -DHAVE_OPENCL -DHAVE_DL -DUSING_ICC_S_FILE" \
 		LDFLAGS="$(LDFLAGS) -L$(OCLROOT)/lib/x86 -L$(OCLROOT)/lib -lcrypt -lOpenCL -ldl"
 	$(MKDIR) ../run/kernels/
 	$(CP_PRESERVE) opencl/*.cl ../run/kernels/
@@ -1081,7 +1081,7 @@ macosx-x86-64-gpu:
 	$(MAKE) $(PROJ) \
 		JOHN_OBJS="$(JOHN_OBJS) $(OCL_OBJS) $(CUDA_OBJS) c3_fmt.o x86-64.o sse-intrinsics.o" \
 		ASFLAGS="$(ASFLAGS) -m64 -DUNDERSCORES -DBSD -DALIGN_LOG" \
-		CFLAGS="$(CFLAGS) -m64 -I$(OCLROOT)/include -DBSD -DHAVE_CRYPT -DCL_VERSION_1_0 -DHAVE_CUDA -Wno-deprecated-declarations" \
+		CFLAGS="$(CFLAGS) -m64 -I$(OCLROOT)/include -DBSD -DHAVE_CRYPT -DHAVE_OPENCL -DHAVE_CUDA -Wno-deprecated-declarations" \
 		LDFLAGS="$(LDFLAGS) -m64 -L$(CUDAPATH) -lcudart -framework OpenCL" \
 		NVCC_FLAGS="$(NVCC_FLAGS) -m64"
 	$(MKDIR) ../run/kernels/
@@ -1094,7 +1094,7 @@ macosx-x86-64-opencl:
 	$(MAKE) $(PROJ) \
 		JOHN_OBJS="$(JOHN_OBJS) $(OCL_OBJS) c3_fmt.o x86-64.o sse-intrinsics.o" \
 		ASFLAGS="$(ASFLAGS) -m64 -DUNDERSCORES -DBSD -DALIGN_LOG" \
-		CFLAGS="$(CFLAGS) -m64 -I$(OCLROOT)/include -DBSD -DHAVE_CRYPT -DCL_VERSION_1_0 -Wno-deprecated-declarations" \
+		CFLAGS="$(CFLAGS) -m64 -I$(OCLROOT)/include -DBSD -DHAVE_CRYPT -DHAVE_OPENCL -Wno-deprecated-declarations" \
 		LDFLAGS="$(LDFLAGS) -m64 -framework OpenCL" \
 		NVCC_FLAGS="$(NVCC_FLAGS) -m64"
 	$(MKDIR) ../run/kernels/
diff -urpN JohnTheRipper.orig/src/options.c JohnTheRipper/src/options.c
--- JohnTheRipper.orig/src/options.c	2013-01-13 03:20:27.332671778 +0000
+++ JohnTheRipper/src/options.c	2013-01-13 03:36:51.868669743 +0000
@@ -39,7 +39,7 @@
 #endif
 #define _PER_NODE ""
 #endif
-#ifdef CL_VERSION_1_0
+#ifdef HAVE_OPENCL
 #include "common-opencl.h"
 #endif
 #if defined(HAVE_CUDA)
@@ -147,11 +147,11 @@ static struct opt_entry opt_list[] = {
 		"%u", &options.regen_lost_salts},
 	{"raw-always-valid", FLG_NONE, FLG_NONE, 0, OPT_REQ_PARAM,
 		"%c", &options.dynamic_raw_hashes_always_valid},
-#ifdef CL_VERSION_1_0
+#ifdef HAVE_OPENCL
 	{"platform", FLG_NONE, FLG_NONE, 0, OPT_REQ_PARAM,
 		OPT_FMT_STR_ALLOC, &options.ocl_platform},
 #endif
-#if defined(CL_VERSION_1_0) || defined(HAVE_CUDA)
+#if defined(HAVE_OPENCL) || defined(HAVE_CUDA)
 	{"device", FLG_NONE, FLG_NONE, 0, OPT_REQ_PARAM,
 		OPT_FMT_STR_ALLOC, &options.gpu_device},
 	{"request-vectorize", FLG_VECTORIZE, FLG_VECTORIZE, 0, FLG_SCALAR},
@@ -209,11 +209,11 @@ static struct opt_entry opt_list[] = {
 #define JOHN_USAGE_TAIL \
 "--list=WHAT               list capabilities, see --list=help or doc/OPTIONS\n"
 
-#if defined(CL_VERSION_1_0) && defined(HAVE_CUDA)
+#if defined(HAVE_OPENCL) && defined(HAVE_CUDA)
 #define JOHN_USAGE_GPU \
 "--platform=N              set OpenCL platform (list using --list=opencl-devices)\n" \
 "--device=N                set OpenCL or CUDA device\n"
-#elif defined(CL_VERSION_1_0)
+#elif defined(HAVE_OPENCL)
 #define JOHN_USAGE_GPU \
 "--platform=N              set OpenCL platform\n" \
 "--device=N                set OpenCL device (list using --list=opencl-devices)\n"
@@ -275,7 +275,7 @@ static void print_usage(char *name)
 
 	printf("%s", JOHN_USAGE_TAIL);
 
-#if defined(CL_VERSION_1_0) || defined(HAVE_CUDA)
+#if defined(HAVE_OPENCL) || defined(HAVE_CUDA)
 	printf("%s", JOHN_USAGE_GPU);
 #endif
 	exit(0);
@@ -304,7 +304,7 @@ void print_hidden_usage(void)
 #ifdef HAVE_DL
 	puts("--plugin=NAME[,..]        load this (these) dynamic plugin(s)");
 #endif
-#if defined(CL_VERSION_1_0) || defined(HAVE_CUDA)
+#if defined(HAVE_OPENCL) || defined(HAVE_CUDA)
 	puts("--request-vectorize       request vectorized mode");
 	puts("--request-scalar          request non-vectorized mode");
 #endif
@@ -368,7 +368,7 @@ void opt_init(char *name, int argc, char
 		return;
 	}
 
-#ifdef CL_VERSION_1_0
+#ifdef HAVE_OPENCL
 	if (options.ocl_platform)
 		platform_id = atoi(options.ocl_platform);
 	if (options.gpu_device)
diff -urpN JohnTheRipper.orig/src/options.h JohnTheRipper/src/options.h
--- JohnTheRipper.orig/src/options.h	2013-01-13 03:20:27.336671778 +0000
+++ JohnTheRipper/src/options.h	2013-01-13 03:39:10.072669456 +0000
@@ -112,7 +112,7 @@
 #define FLG_CRKSTAT			0x0000004000000000ULL
 /* Wordlist dupe suppression */
 #define FLG_DUPESUPP			0x0000008000000000ULL
-#if defined(CL_VERSION_1_0) || defined (HAVE_CUDA)
+#if defined(HAVE_OPENCL) || defined (HAVE_CUDA)
 /* Request to vectorize */
 #define FLG_VECTORIZE			0x0000010000000000ULL
 /* Request to not vectorize */
@@ -232,7 +232,7 @@ struct options_main {
    use raw hashes as valid in dynamic. */
 	char dynamic_raw_hashes_always_valid;
 
-#ifdef CL_VERSION_1_0
+#ifdef HAVE_OPENCL
 	char *ocl_platform, *gpu_device;
 #elif defined(HAVE_CUDA)
 	char *gpu_device;
diff -urpN JohnTheRipper.orig/src/x86-64.h JohnTheRipper/src/x86-64.h
--- JohnTheRipper.orig/src/x86-64.h	2013-01-13 03:20:27.332671778 +0000
+++ JohnTheRipper/src/x86-64.h	2013-01-13 03:40:27.820669295 +0000
@@ -22,7 +22,7 @@
 #define ARCH_ALLOWS_UNALIGNED		1
 #define ARCH_INDEX(x)			((unsigned int)(unsigned char)(x))
 
-#if defined(__CYGWIN32__) || defined(__BEOS__) || defined(__MINGW32__) || defined(_MSC_VER) || (defined(AMDAPPSDK) && defined(CL_VERSION_1_0))
+#if defined(__CYGWIN32__) || defined(__BEOS__) || defined(__MINGW32__) || defined(_MSC_VER) || (defined(AMDAPPSDK) && defined(HAVE_OPENCL))
 #define OS_TIMER			0
 #else
 #define OS_TIMER			1
diff -urpN JohnTheRipper.orig/src/x86-sse.h JohnTheRipper/src/x86-sse.h
--- JohnTheRipper.orig/src/x86-sse.h	2013-01-13 03:20:27.332671778 +0000
+++ JohnTheRipper/src/x86-sse.h	2013-01-13 03:40:02.624669347 +0000
@@ -24,7 +24,7 @@
 #define ARCH_ALLOWS_UNALIGNED		1
 #define ARCH_INDEX(x)			((unsigned int)(unsigned char)(x))
 
-#if defined(__CYGWIN32__) || defined(__BEOS__) || defined(__MINGW32__) || defined(_MSC_VER) || (defined(AMDAPPSDK) && defined(CL_VERSION_1_0))
+#if defined(__CYGWIN32__) || defined(__BEOS__) || defined(__MINGW32__) || defined(_MSC_VER) || (defined(AMDAPPSDK) && defined(HAVE_OPENCL))
 #define OS_TIMER			0
 #else
 #define OS_TIMER			1