diff --git a/include/dcc.h b/include/dcc.h
index 9cc1e7c..8b1f3c1 100644
--- a/include/dcc.h
+++ b/include/dcc.h
@@ -97,22 +97,13 @@
 #define DCC_OFFER	0x00040000
 #define DCC_DELETE	0x00080000
 #define DCC_TWOCLIENTS	0x00100000
-
-#ifdef NON_BLOCKING_CONNECTS
-#define DCC_CNCT_PEND	0x00200000
-#endif
-
-#ifdef HAVE_SSL
-#define DCC_SSL		0x04000000
-#endif
-
 #define DCC_QUEUE	0x00400000
 #define DCC_TDCC	0x00800000
 #define DCC_BOTCHAT	0x01000000
 #define DCC_ECHO	0x02000000
+#define DCC_SSL		0x04000000
 #define DCC_STATES	0xffffff00
 
-
 	int	check_dcc_list (char *);
 	int	dcc_exempt_save (FILE *);
 
diff --git a/source/dcc.c b/source/dcc.c
index 87db455..d0706f8 100644
--- a/source/dcc.c
+++ b/source/dcc.c
@@ -543,9 +543,6 @@ DCC_List		*new_i;
 		s = &new_i->sock;
 		new = (DCC_int *)s->info;
 
-#ifdef DCC_CNCT_PEND
-		flags |= DCC_CNCT_PEND;
-#endif
 		new->remport = ntohs(new->remport);
 		if ((new_s = connect_by_number(inet_ntoa(new->remote), &new->remport, SERVICE_CLIENT, PROTOCOL_TCP, 0)) < 0
 #ifdef HAVE_SSL
@@ -627,9 +624,6 @@ DCC_List		*new_i;
 		if (get_int_var(DCC_FORCE_PORT_VAR))
 			portnum = get_int_var(DCC_FORCE_PORT_VAR);
 
-#ifdef DCC_CNCT_PEND
-		flags |= DCC_CNCT_PEND;
-#endif
 		flags |= DCC_WAIT;
 		if ((s = connect_by_number(NULL, &portnum, SERVICE_SERVER, PROTOCOL_TCP, 1)) < 0)
 		{
@@ -1245,7 +1239,7 @@ UserList *ul = NULL;
 			reset_display_target();
 			return;
 		}
-		if ((s->flags && DCC_WAIT))
+		if ((s->flags & DCC_WAIT))
 		{
 			if (Ctype == DCC_CHAT)
 			{