4 files changed, 5 insertions, 11 deletions
diff --git a/ept/debtags/debtags.cc b/ept/debtags/debtags.cc
index 068330f..a889ae3 100644
--- a/ept/debtags/debtags.cc
+++ b/ept/debtags/debtags.cc
@@ -39,10 +39,9 @@
 #include <sstream>
 
 #include <sys/wait.h>	// WIFEXITED WEXITSTATUS
-#include <sys/types.h>	// getpwuid, stat, mkdir, getuid
-#include <sys/stat.h>	// stat, mkdir
+#include <sys/types.h>	// getpwuid, getuid
 #include <pwd.h>	// getpwuid
-#include <unistd.h>	// stat, getuid
+#include <unistd.h>	// getuid
 
 
 using namespace std;
diff --git a/ept/debtags/maint/path.cc b/ept/debtags/maint/path.cc
index 8fdae9a..bb08682 100644
--- a/ept/debtags/maint/path.cc
+++ b/ept/debtags/maint/path.cc
@@ -28,10 +28,9 @@
 #include <wibble/sys/fs.h>
 #include <wibble/string.h>
 
-#include <sys/types.h>	// getpwuid, stat, mkdir, getuid
-#include <sys/stat.h>	// stat, mkdir
+#include <sys/types.h>	// getpwuid, getuid
 #include <pwd.h>		// getpwuid
-#include <unistd.h>		// stat, getuid
+#include <unistd.h>		// getuid
 
 using namespace wibble;
 
@@ -65,8 +64,7 @@ int Path::access( const std::string &s, int m ) {
 }
 
 time_t Path::timestamp( const std::string& file ) {
-	std::auto_ptr<struct stat> st = wibble::sys::fs::stat(file);
-	return st.get() == NULL ? 0 : st->st_mtime;
+    return sys::fs::timestamp(file, 0);
 }
 
 void Path::setDebtagsSourceDir( const std::string &s )
diff --git a/ept/debtags/maint/path.h b/ept/debtags/maint/path.h
index 0127829..2c7f95e 100644
--- a/ept/debtags/maint/path.h
+++ b/ept/debtags/maint/path.h
@@ -23,8 +23,6 @@
 
 #include <string>
 
-struct stat;
-
 #ifndef EPT_DEBTAGS_PATH_H
 #define EPT_DEBTAGS_PATH_H
 
diff --git a/ept/debtags/vocabulary.cc b/ept/debtags/vocabulary.cc
index 1f85d12..5c84ea4 100644
--- a/ept/debtags/vocabulary.cc
+++ b/ept/debtags/vocabulary.cc
@@ -30,7 +30,6 @@
 #include <sstream>
 
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
 using namespace std;