diff --git a/Changes.mysql b/Changes.mysql
index 2dbb0827d..01cd74b55 100644
--- a/Changes.mysql
+++ b/Changes.mysql
@@ -1,5 +1,6 @@
 Anope Version S V N
 -------------------
+- DROP TABLE `anope_os_hcache`;
 
 Anope Version 1.7.8
 -------------------
diff --git a/makefile.win32 b/Makefile.win32
similarity index 93%
rename from makefile.win32
rename to Makefile.win32
index 4d2a6419c..674a57620 100644
--- a/makefile.win32
+++ b/Makefile.win32
@@ -25,7 +25,7 @@ install:
         cd lang && $(MAKE) install && cd ..
         cd src && $(MAKE) install && cd ..
         cd src\modules && $(MAKE) install && cd ..
-	cd src\modules && $(MAKE) subs-install && cd ..
+		cd src\modules && $(MAKE) subs-install && cd ..
         -@echo ---
         -@echo Anope has been insalled successfully!
         -@echo ---
@@ -33,14 +33,13 @@ install:
 clean:
         cd src && $(MAKE) spotless && cd ..
         cd lang && $(MAKE) spotless && cd ..
-        -@erase src\*.exe
         -@erase *.exe version.h *.obj
-        cd src/modules && $(MAKE) spotless && cd ../..
+        cd src\modules && $(MAKE) spotless && cd ..\..
 
 spotless:
         cd lang && $(MAKE) spotless && cd ..
         cd src && $(MAKE) spotless && cd ..
-        cd src/modules && $(MAKE) spotless && cd ../..
+        cd src\modules && $(MAKE) spotless && cd ..\..
         -@erase include\language.h include\version.h *~ services.exe version.sh.exe *.obj anopesmtp.exe
 
 mypasql: 
@@ -133,7 +132,7 @@ languages: FRC
         cd lang && $(MAKE) && cd ..
 
 anopesmtp: FRC
-        $(CC) src/tools/anopesmtp.c /link wsock32.lib $(LFLAGS)
+        $(CC) src\tools\anopesmtp.c /link wsock32.lib $(LFLAGS)
 
 modules: FRC
         cd src\modules && $(MAKE) && cd ..\..
@@ -143,13 +142,13 @@ modules: FRC
 include\sysconf.h:
         copy include\sysconf.h.win32 include\sysconf.h
 
-lang/language.h: lang/Makefile lang/index
+lang\language.h: lang\Makefile lang\index
         cd lang && $(MAKE) language.h && cd ..
 
-lang/index:
+lang\index:
         cd lang && $(MAKE) index && cd ..
         
-include/language.h: lang/language.h
+include\language.h: lang\language.h
         cd lang && copy language.h ..\include\language.h && cd ..
         
 include\version.h: version.sh.exe version.log include\services.h include\pseudo.h include\messages.h include\pseudo.h include\messages.h
@@ -157,6 +156,6 @@ include\version.h: version.sh.exe version.log include\services.h include\pseudo.
                 copy version.h include\version.h
 
 version.sh.exe:
-        $(CC) include/version.sh.c
+        $(CC) include\version.sh.c
 
 FRC:
diff --git a/data/tables.sql b/data/tables.sql
index 342367e26..d3170c9a1 100644
--- a/data/tables.sql
+++ b/data/tables.sql
@@ -296,19 +296,6 @@ CREATE TABLE anope_os_exceptions (
   PRIMARY KEY  (oe_id)
 ) TYPE=MyISAM;
 
---
--- Table structure for table `anope_os_hcache`
---
-
-DROP TABLE IF EXISTS anope_os_hcache;
-CREATE TABLE anope_os_hcache (
-  oh_id int(11) NOT NULL auto_increment,
-  mask text NOT NULL,
-  status int(11) NOT NULL default '0',
-  used int(11) NOT NULL default '0',
-  PRIMARY KEY  (oh_id)
-) TYPE=MyISAM;
-
 --
 -- Table structure for table `anope_os_news`
 --
diff --git a/makefile.inc.win32 b/makefile.inc.win32
index ea65d1abb..b10b1656d 100644
--- a/makefile.inc.win32
+++ b/makefile.inc.win32
@@ -1,5 +1,5 @@
 #
-# Anope IRC Services 1.7.7 for Windows
+# Anope IRC Services 1.7.8 for Windows
 #
 #  Contact us at info@anope.org
 #
@@ -67,7 +67,7 @@ LFLAGS=/LIBPATH:"$(LIBPATH)"
 
 CC=cl
 RC=rc
-MAKE=nmake -f makefile.win32
+MAKE=nmake -f Makefile.win32
 BASE_CFLAGS=/O2 /MD
 LIBS=wsock32.lib advapi32.lib /NODEFAULTLIB:libcmtd.lib
 ELIBS=
diff --git a/src/modules/catserv/catserv_extern.h b/src/modules/catserv/catserv_extern.h
index 08c76da17..02c21addb 100644
--- a/src/modules/catserv/catserv_extern.h
+++ b/src/modules/catserv/catserv_extern.h
@@ -1,7 +1,11 @@
 #ifndef CATSERV_DEFS_H
 #define CATSERV_DEFS_H
 
+#ifdef _WIN32
+extern __declspec(dllexport) char *s_CatServ;
+#else
 E char *s_CatServ;
+#endif
 
 #endif
 
diff --git a/src/mysql.c b/src/mysql.c
index d07a4648a..4eadae97a 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -644,7 +644,7 @@ void db_mysql_save_os_db(unsigned int maxucnt, unsigned int maxutime,
     Akill *t_ak;
     SXLine *t_sl;
     char *takuser, *takhost, *takby, *takreason, *tslmask, *tslby,
-        *tslreason, *thchost;
+        *tslreason;
 
     int i, j;
 
@@ -1016,7 +1016,7 @@ void db_mysql_load_os_dbase(void)
     char sqlcmd[MAX_SQL_BUF];
     Akill *ak;
     SXLine *sx;
-    int akc, sgc, sqc, szc, j;
+    int akc, sgc, sqc, szc;
 
     if (!do_mysql)
         return;
diff --git a/src/operserv.c b/src/operserv.c
index 390f0a11a..4f189b560 100644
--- a/src/operserv.c
+++ b/src/operserv.c
@@ -490,7 +490,7 @@ static void load_old_akill(void)
 void load_os_dbase(void)
 {
     dbFILE *f;
-    int16 i, ver, c;
+    int16 i, ver;
     uint16 tmp16, n;
     uint32 tmp32;
     char *s;
diff --git a/version.log b/version.log
index ebe997245..a38c69d57 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="8"
-VERSION_BUILD="606"
+VERSION_BUILD="607"
 
 # $Log$
 #
+# BUILD : 1.7.8 (607)
+# BUGS  : N/A
+# NOTES : Clean up after proxy was removed, some Win32 touch ups
+#
 # BUILD : 1.7.8 (606)
 # BUGS  : 
 # NOTES : Removed proxy detector code from the core, threads stuff still there. Needs good testing