4 files changed, 14 insertions, 25 deletions
diff --git a/cache.c b/cache.c
index 89f7ecd..7860fc7 100644
--- a/cache.c
+++ b/cache.c
@@ -7,7 +7,6 @@
  */
 
 #include "cgit.h"
-#include "cache.h"
 
 const int NOLOCK = -1;
 
diff --git a/cache.h b/cache.h
deleted file mode 100644
index 4dcbea3..0000000
--- a/cache.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Since git has it's own cache.h which we include,
- * lets test on CGIT_CACHE_H to avoid confusion
- */
-
-#ifndef CGIT_CACHE_H
-#define CGIT_CACHE_H
-
-struct cacheitem {
-	char *name;
-	struct stat st;
-	int ttl;
-	int fd;
-};
-
-extern char *cache_safe_filename(const char *unsafe);
-extern int cache_lock(struct cacheitem *item);
-extern int cache_unlock(struct cacheitem *item);
-extern int cache_cancel_lock(struct cacheitem *item);
-extern int cache_exist(struct cacheitem *item);
-extern int cache_expired(struct cacheitem *item);
-
-#endif /* CGIT_CACHE_H */
diff --git a/cgit.c b/cgit.c
index 73b1f02..f749b6b 100644
--- a/cgit.c
+++ b/cgit.c
@@ -7,7 +7,6 @@
  */
 
 #include "cgit.h"
-#include "cache.h"
 #include "cmd.h"
 #include "ui-shared.h"
 
diff --git a/cgit.h b/cgit.h
index f600912..e82e9aa 100644
--- a/cgit.h
+++ b/cgit.h
@@ -46,6 +46,13 @@ typedef void (*configfn)(const char *name, const char *value);
 typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
 
+struct cacheitem {
+	char *name;
+	struct stat st;
+	int ttl;
+	int fd;
+};
+
 struct cgit_repo {
 	char *url;
 	char *name;
@@ -220,6 +227,13 @@ extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 extern struct taginfo *cgit_parse_tag(struct tag *tag);
 extern void cgit_parse_url(const char *url);
 
+extern char *cache_safe_filename(const char *unsafe);
+extern int cache_lock(struct cacheitem *item);
+extern int cache_unlock(struct cacheitem *item);
+extern int cache_cancel_lock(struct cacheitem *item);
+extern int cache_exist(struct cacheitem *item);
+extern int cache_expired(struct cacheitem *item);
+
 extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);