diff --git a/CPP.pm b/CPP.pm
index 63c471b..807d35d 100644
--- a/CPP.pm
+++ b/CPP.pm
@@ -7,7 +7,7 @@ use Exporter;
 
 require DynaLoader;
 
-$VERSION = 0.06;
+$VERSION = 0.07;
 @ISA = qw(Exporter DynaLoader);
 @EXPORT_OK = ();
 %EXPORT_TAGS = (
diff --git a/config.h.PL b/config.h.PL
index 5d1b061..2f11d2d 100644
--- a/config.h.PL
+++ b/config.h.PL
@@ -26,14 +26,11 @@ print OUT "#define HAVE_SYS_STAT_H 1\n" if $Config{i_sysstat};
 print OUT "#define HAVE_SYS_WAIT_H 1\n" if $Config{i_syswait};
 print OUT "#define HAVE_UNISTD_H 1\n" if $Config{i_unistd};
 
-if (($Config{i_systime} eq 'define') and
-	($Config{i_time} eq 'define')) {
+if ($Config{i_systime} && $Config{i_time}) {
 	print OUT "#define TIME_WITH_SYS_TIME 1\n";
 }
-else {
-	print OUT "#$Config{i_time} HAVE_TIME_H 1\n";
-	print OUT "#$Config{i_systime} HAVE_SYS_TIME_H 1\n";
-}
+print OUT "#define HAVE_TIME_H 1\n" if $Config{i_time};
+print OUT "#define HAVE_SYS_TIME_H 1\n" if $Config{i_systime};
 # print OUT "#define HAVE_STRSIGNAL 1\n" if $Config{i_foo} eq 'define';
 
 print OUT <<"EOF"
diff --git a/cpperror.c b/cpperror.c
index f34b1e2..72ea4c0 100644
--- a/cpperror.c
+++ b/cpperror.c
@@ -11,6 +11,7 @@
 
 
 
+#if 0
 static void print_location PARAMS ((cpp_reader *, unsigned int, unsigned int));
 
 /* Print the logical file location (LINE, COL) in preparation for a
@@ -45,6 +46,7 @@ print_location (pfile, line, col)
       fputc (' ', stderr);
     }
 }
+#endif
 
 /* Hacked out of _cpp_begin_message by Shevek. This contains the common
  * logic between the printf and the SV versions. */
@@ -92,6 +94,7 @@ _cpp_can_begin_message (pfile, code, line, column, levelp)
   return 1;
 }
 
+#if 0
 /* Set up for a diagnostic: print the file and line, bump the error
    counter, etc.  LINE is the logical line number; zero means to print
    at the location of the previously lexed token, which tends to be
@@ -113,6 +116,7 @@ _cpp_begin_message (pfile, code, line, column)
 		fputs (_("internal error: "), stderr);
 	return 1;
 }
+#endif
 
 
 
diff --git a/cpphash.h b/cpphash.h
index a59cfa6..a78c76e 100644
--- a/cpphash.h
+++ b/cpphash.h
@@ -494,9 +494,11 @@ extern unsigned char _cpp_trigraph_map[UCHAR_MAX + 1];
 #define CPP_PEDANTIC(PF) CPP_OPTION (PF, pedantic)
 #define CPP_WTRADITIONAL(PF) CPP_OPTION (PF, warn_traditional)
 
+#if 0
 /* In cpperror.c  */
 extern int _cpp_begin_message PARAMS ((cpp_reader *, int,
 				       unsigned int, unsigned int));
+#endif
 
 /* In cppmacro.c */
 extern void _cpp_free_definition	PARAMS ((cpp_hashnode *));