diff --git a/src/c/alloc_2.d b/src/c/alloc_2.d
index 850fc97ea..5e976002c 100644
--- a/src/c/alloc_2.d
+++ b/src/c/alloc_2.d
@@ -105,9 +105,6 @@ cl_alloc_object(cl_type t)
 		goto FINALIZE;
 #else
 		break;
-#endif
-#ifdef ENABLE_THREADS
-	case t_lock:
 #endif
 	case t_stream:
 		obj = (cl_object)GC_MALLOC(type_size[t]);
@@ -143,7 +140,7 @@ cl_alloc_object(cl_type t)
 #else
 	case t_structure:
 #endif
-#ifdef THREADS
+#ifdef ECL_THREADS
 	case t_process:
         case t_lock:
 #endif
diff --git a/src/c/gbc.d b/src/c/gbc.d
index 80dd6568e..4a3258001 100644
--- a/src/c/gbc.d
+++ b/src/c/gbc.d
@@ -488,7 +488,7 @@ mark_cl_env(struct cl_env_struct *env)
 	mark_object(env->big_register[1]);
 	mark_object(env->big_register[2]);
 
-#ifdef THREADS
+#ifdef ECL_THREADS
 /* We should mark the stacks of the threads somehow!!! */
 #error "The old garbage collector does not support threads"
 #else
@@ -545,7 +545,7 @@ mark_phase(void)
 	for (i = 0; i < gc_roots;  i++)
 		mark_object(*gc_root[i]);
 
-#ifdef THREADS
+#ifdef ECL_THREADS
 	mark_object(cl_core.processes);
 #else
 	mark_cl_env(&cl_env);
diff --git a/src/c/tcp.d b/src/c/tcp.d
index 5bed502bc..c26fda028 100644
--- a/src/c/tcp.d
+++ b/src/c/tcp.d
@@ -216,7 +216,7 @@ create_server_port(int port)
     FElibc_error("Binding TCP socket", 0);
   if (listen(request, 1))
     FElibc_error("TCP listening", 0);
-#ifdef THREADS
+#ifdef ECL_THREADS
   /* Don't make this file-descriptor non-blocking
    * just block on it before we attempt to accept from it
    * Think _hard_ about moving this out of here, into somewhere sane