diff --git a/src/engine/timestamp.c b/src/engine/timestamp.c
index c34de2015..7b27ecf54 100644
--- a/src/engine/timestamp.c
+++ b/src/engine/timestamp.c
@@ -12,15 +12,6 @@
 
 /*
  * timestamp.c - get the timestamp of a file or archive member
- *
- * External routines:
- *  timestamp_from_target() - return timestamp on a file, if present
- *  timestamp_done()        - free timestamp tables
- *
- * Internal routines:
- *  time_enter()      - internal worker callback for scanning archives &
- *                      directories
- *  free_timestamps() - worker function for freeing timestamp table contents
  */
 
 #include "jam.h"
@@ -37,7 +28,9 @@
  * BINDING - all known files
  */
 
-typedef struct _binding {
+typedef struct _binding BINDING;
+
+struct _binding {
     OBJECT * name;
     short    flags;
 
@@ -53,7 +46,7 @@ typedef struct _binding {
 
     /* update time - 0 if not exist */
     time_t   time;
-} BINDING;
+};
 
 static struct hash * bindhash = 0;
 static void time_enter( void *, OBJECT *, int const found, time_t );
@@ -69,10 +62,10 @@ static char * time_progress[] =
 
 
 /*
- * timestamp_from_target() - return timestamp on a file, if present
+ * timestamp() - return timestamp on a file, if present.
  */
 
-void timestamp_from_target( OBJECT * target, time_t * time )
+void timestamp( OBJECT * target, time_t * time )
 {
     PROFILE_ENTER( timestamp );
 
@@ -187,10 +180,6 @@ void timestamp_from_target( OBJECT * target, time_t * time )
 }
 
 
-/*
- * time_enter() - internal worker callback for scanning archives & directories
- */
-
 static void time_enter( void * closure, OBJECT * target, int const found,
     time_t time )
 {
@@ -217,11 +206,6 @@ static void time_enter( void * closure, OBJECT * target, int const found,
     object_free( target );
 }
 
-
-/*
- * free_timestamps() - worker function for freeing timestamp table contents
- */
-
 static void free_timestamps( void * xbinding, void * data )
 {
     object_free( ((BINDING *)xbinding)->name );
@@ -229,10 +213,10 @@ static void free_timestamps( void * xbinding, void * data )
 
 
 /*
- * timestamp_done() - free timestamp tables
+ * stamps_done() - free timestamp tables.
  */
 
-void timestamp_done()
+void stamps_done()
 {
     if ( bindhash )
     {