- Cleanup headers and remove stale file.

4 files changed, 5 insertions, 32 deletions

diff --git a/include/debug.h b/include/debug.h
index 18c891e..d1965eb 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -37,4 +37,4 @@ extern pthread_mutex_t __debug_lock__;
 #endif 
 
 
-#endif
+#endif /* !_DEBUG_H_ */
diff --git a/include/mfs_cleanup.h b/include/mfs_cleanup.h
deleted file mode 100644
index 41bc492..0000000
--- a/include/mfs_cleanup.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Musicfs is a FUSE module implementing a media filesystem in userland.
- * Copyright (C) 2008  Ulf Lilleengen, Kjetil Ørbekk
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version
- * 2, as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * A copy of the license can typically be found in COPYING
- */
-
-#ifndef _MFS_CLEANUP_H_
-#define _MFS_CLEANUP_H_
-struct fuse_args;
-
-#include <sqlite3.h>
-
-#endif
diff --git a/include/mfs_cleanup_db.h b/include/mfs_cleanup_db.h
index 24e977a..4c4611b 100644
--- a/include/mfs_cleanup_db.h
+++ b/include/mfs_cleanup_db.h
@@ -26,4 +26,4 @@ struct fuse_args;
 
 void mfs_cleanup_db(sqlite3 *handle);
 
-#endif
+#endif /* !_MFS_CLEANUP_DB_ */
diff --git a/include/musicfs.h b/include/musicfs.h
index e484e00..54613f0 100644
--- a/include/musicfs.h
+++ b/include/musicfs.h
@@ -18,8 +18,8 @@
  * A copy of the license can typically be found in COPYING
  */
 
-#ifndef _MP3FS_H_
-#define _MP3FS_H_
+#ifndef _MUSICFS_H_
+#define _MUSICFS_H_
 
 #include <fuse.h>
 
@@ -79,4 +79,4 @@ int      mfs_reload_config();
 char    *mfs_get_home_path(const char *);
 
 enum mfs_filetype mfs_get_filetype(const char *);
-#endif
+#endif /* !_MUSICFS_H_ */