diff --git a/lib/pcre/pcre.vcproj b/lib/pcre/pcre.vcproj
index 8130844d..64ec6f1d 100755
--- a/lib/pcre/pcre.vcproj
+++ b/lib/pcre/pcre.vcproj
@@ -103,6 +103,18 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
 				RelativePath="chartables.c">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="get.c">
diff --git a/src/confuse.c b/src/confuse.c
index ec22f722..1b0680c7 100644
--- a/src/confuse.c
+++ b/src/confuse.c
@@ -19,27 +19,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "neostats.h"
 
 #ifdef HAVE_STRING_H
 # define _GNU_SOURCE    /* FIXME! */
 # include <string.h>
 #endif
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#include <assert.h>
-#include <errno.h>
 #ifndef _WIN32
-# include <pwd.h>
+#include <pwd.h>
 #endif
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#include <ctype.h>
 
 #include "confuse.h"
 
diff --git a/src/timer.c b/src/timer.c
index 49e56627..8e92c1ed 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -326,7 +326,6 @@ static void
 run_mod_timers (int ismidnight)
 {
 	struct tm *ts;
-	int deleteme = 0;
 	Timer *timer = NULL;
 	hscan_t tscan;
 	hnode_t *tn;
@@ -369,7 +368,6 @@ run_mod_timers (int ismidnight)
 						timer->lastrun = me.now;
  						continue;
 					}
-					deleteme = 1;
 					break;
 			}
 			if (setjmp (sigvbuf) == 0) {
@@ -384,7 +382,7 @@ run_mod_timers (int ismidnight)
 					timer->lastrun = (int) me.now;
 				}
 				RESET_RUN_LEVEL();
-				if (deleteme) {
+				if (timer->type == TIMER_TYPE_COUNTDOWN) {
 					hash_scan_delete (timerhash, tn);
 					hnode_destroy (tn);
 					ns_free (timer);