diff --git a/Timeline/LASH_Client.C b/Timeline/LASH_Client.C
index 8c36bb6..54aad69 100644
--- a/Timeline/LASH_Client.C
+++ b/Timeline/LASH_Client.C
@@ -24,7 +24,7 @@
 
 LASH_Client::LASH_Client ( )
 {
-    _void = NULL;
+    _void = 0;
 }
 
 LASH_Client::~LASH_Client ( )
diff --git a/util/debug.C b/util/debug.C
index d786914..f5275be 100644
--- a/util/debug.C
+++ b/util/debug.C
@@ -19,11 +19,15 @@
 
 #include "debug.h"
 
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+
 void
 warnf ( warning_t level,
 	   const char *module,
 	   const char *file,
-	   const char *function, size_t line, const char *fmt, ... )
+	   const char *function, int line, const char *fmt, ... )
 {
 	va_list args;
 	static const char *level_tab[] = {
diff --git a/util/debug.h b/util/debug.h
index 0baf871..ee490eb 100644
--- a/util/debug.h
+++ b/util/debug.h
@@ -81,10 +81,6 @@
 	#define __FUNCTION__ NULL
 #endif
 
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-
 typedef enum {
 	W_MESSAGE = 0,
 	W_WARNING,
@@ -95,7 +91,7 @@ void
 warnf ( warning_t level,
 	   const char *module,
 	   const char *file,
-        const char *function, size_t line, const char *fmt, ... );
+        const char *function, int line, const char *fmt, ... );
 
 
 #ifndef NDEBUG