diff -urN bitchx-1.1-r2/work/BitchX/dll/aim/toc/toc.h bitchx-1.1-r2-new/work/BitchX/dll/aim/toc/toc.h
--- bitchx-1.1-r2/work/BitchX/dll/aim/toc/toc.h	2003-04-10 18:09:06.000000000 -0700
+++ bitchx-1.1-r2-new/work/BitchX/dll/aim/toc/toc.h	2006-07-01 17:44:48.053501000 -0700
@@ -150,9 +150,9 @@
 void parse_toc_buddy_list(char *);
 void translate_toc_error_code(char *c);
 
-extern int toc_fd;
-extern int seqno;
-extern unsigned int peer_ver;
+/* extern int toc_fd; */
+/* extern int seqno; */
+/* extern unsigned int peer_ver; */
 extern int state;
 /* extern int inpa; */
 
@@ -207,9 +207,9 @@
 void serv_set_away(char *message);
 
 extern int idle_timer;
-extern time_t lastsent;
+/* extern time_t lastsent; */
 extern time_t login_time;
-extern struct timeval lag_tv;
+/* extern struct timeval lag_tv; */
 extern int is_idle;
 extern int lag_ms;
 extern int permdeny;
diff -urN bitchx-1.1-r2/work/BitchX/include/ctcp.h bitchx-1.1-r2-new/work/BitchX/include/ctcp.h
--- bitchx-1.1-r2/work/BitchX/include/ctcp.h	2003-04-10 18:09:07.000000000 -0700
+++ bitchx-1.1-r2-new/work/BitchX/include/ctcp.h	2006-07-01 17:47:04.874051750 -0700
@@ -56,7 +56,7 @@
 extern CtcpEntryDll *dll_ctcp;
 
 
-extern		char	*ctcp_type[];
+/* extern		char	*ctcp_type[]; */
 extern		int	sed;
 extern		int	in_ctcp_flag;
 
diff -urN bitchx-1.1-r2/work/BitchX/include/modval.h bitchx-1.1-r2-new/work/BitchX/include/modval.h
--- bitchx-1.1-r2/work/BitchX/include/modval.h	2003-04-10 18:09:07.000000000 -0700
+++ bitchx-1.1-r2-new/work/BitchX/include/modval.h	2006-07-01 17:36:50.155634250 -0700
@@ -650,7 +650,7 @@
 #define start_time ((time_t) *((time_t *)global[START_TIME]))
 #define idle_time() ((time_t) *((time_t *)global[IDLE_TIME]()))
 
-#define loading_global ((int) *((int *)global[LOADING_GLOBAL]))
+#define loading_global (*((int *)global[LOADING_GLOBAL]))
 #define target_window (*((Window **)global[TARGET_WINDOW]))
 #define current_window (*((Window **)global[CURRENT_WINDOW]))
 #define invisible_list (*((Window **)global[INVISIBLE_LIST]))
@@ -669,7 +669,7 @@
 #define status_update_flag ((int) *((int *)global[STATUS_UPDATE_FLAG]))
 #define tabkey_array (*((NickTab **)global[TABKEY_ARRAY]))
 #define autoreply_array (*((NickTab *)global[AUTOREPLY_ARRAY]))
-#define identd ((int) *((int *)global[IDENTD_SOCKET]))
+#define identd *((int *)global[IDENTD_SOCKET])
 #define doing_notice ((int) *((int *)global[DOING_NOTICE]))
 #define last_sent_msg_body (*((char **)global[LAST_SENT_MSG_BODY]))
 #define sent_nick (*((char **)global[SENT_NICK]))
diff -urN bitchx-1.1-r2/work/BitchX/include/struct.h bitchx-1.1-r2-new/work/BitchX/include/struct.h
--- bitchx-1.1-r2/work/BitchX/include/struct.h	2003-04-10 18:09:07.000000000 -0700
+++ bitchx-1.1-r2-new/work/BitchX/include/struct.h	2006-07-01 17:47:50.336893000 -0700
@@ -1064,7 +1064,7 @@
 	int	delete;
 }	TimerList;
 
-extern TimerList *PendingTimers;
+/* extern TimerList *PendingTimers; */
 typedef struct nicktab_stru
 {
 	struct nicktab_stru *next;