diff --git a/src/debug.h b/src/debug.h
index 42442f5..d4e53aa 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -8,8 +8,8 @@
  *   (at your option) any later version.
  */
 
-#ifndef __COMMON_DEBUG_H
-#define __COMMON_DEBUG_H
+#ifndef __DEBUG_H
+#define __DEBUG_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -38,4 +38,4 @@
 #define dprint(...)
 #endif /* __DEBUG__ */
 
-#endif /* __COMMON_DEBUG_H */
+#endif /* __DEBUG_H */
diff --git a/src/event.h b/src/event.h
index c7e075a..487bdcc 100644
--- a/src/event.h
+++ b/src/event.h
@@ -9,8 +9,8 @@
  *  (at your option) any later version.
  */
 
-#ifndef __NOTIFY_EVENT_H
-#define __NOTIFY_EVENT_H
+#ifndef __EVENT_H
+#define __EVENT_H
 
 #include <stdint.h>
 
@@ -44,4 +44,4 @@ void notify_event_set_type(notify_event *event, uint8_t type);
 
 const char* notify_event_typetostr(notify_event *event);
 
-#endif /* __NOTIFY_EVENT_H */
+#endif /* __EVENT_H */
diff --git a/src/fscrawl.c b/src/fscrawl.c
index 7e0b1e6..74fee87 100644
--- a/src/fscrawl.c
+++ b/src/fscrawl.c
@@ -1,6 +1,6 @@
 /* fscrawl.c - Filesystem traversal
  * 
- *  (C) Copyright 2010 Henrik Hautakoski <henrik@fiktivkod.org>
+ *  Copyright (C) 2010   Henrik Hautakoski <henrik@fiktivkod.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/fscrawl.h b/src/fscrawl.h
index fbf5262..7361cc0 100644
--- a/src/fscrawl.h
+++ b/src/fscrawl.h
@@ -1,6 +1,6 @@
 /* fscrawl.h - Filesystem traversal
  * 
- *  (C) Copyright 2010 Henrik Hautakoski <henrik@fiktivkod.org>
+ *  Copyright (C) 2010   Henrik Hautakoski <henrik@fiktivkod.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -8,8 +8,8 @@
  *  (at your option) any later version.
  */
 
-#ifndef __NOTIFY_FSCRAWL_H
-#define __NOTIFY_FSCRAWL_H
+#ifndef __FSCRAWL_H
+#define __FSCRAWL_H
 
 typedef struct {
     char *name;
@@ -27,4 +27,4 @@ fs_entry* fsc_cpy(fs_entry *ent);
 
 fs_entry* fsc_read(fscrawl_t f);
 
-#endif /* __NOTIFY_FSCRAWL_H */
+#endif /* __FSCRAWL_H */
diff --git a/src/path.h b/src/path.h
index fe2224f..8b2337a 100644
--- a/src/path.h
+++ b/src/path.h
@@ -8,8 +8,8 @@
  *   (at your option) any later version.
  */
 
-#ifndef __COMMON_PATH_H
-#define __COMMON_PATH_H
+#ifndef __PATH_H
+#define __PATH_H
 
 #include <stddef.h>
 #include <libgen.h>
@@ -20,4 +20,4 @@ size_t pathlen(const char *path);
 
 char* path_normalize(const char *base, const char *name, unsigned char dir);
 
-#endif /* __COMMON_PATH_H */
+#endif /* __PATH_H */
diff --git a/src/queue.h b/src/queue.h
index 4077937..1e2b1b4 100644
--- a/src/queue.h
+++ b/src/queue.h
@@ -11,8 +11,8 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __NOTIFY_QUEUE_H
-#define __NOTIFY_QUEUE_H
+#ifndef __QUEUE_H
+#define __QUEUE_H
 
 #include <stddef.h>
 
@@ -32,4 +32,4 @@ void queue_clear(queue_t q);
 
 void queue_destroy(queue_t q);
 
-#endif /* __NOTIFY_QUEUE_H */
+#endif /* __QUEUE_H */
diff --git a/src/rbtree.h b/src/rbtree.h
index 4b6f820..142f635 100644
--- a/src/rbtree.h
+++ b/src/rbtree.h
@@ -8,8 +8,8 @@
  *   (at your option) any later version.
  */
 
-#ifndef __COMMON_RBTREE_H
-#define __COMMON_RBTREE_H
+#ifndef __RBTREE_H
+#define __RBTREE_H
 
 #define RB_RED   0
 #define RB_BLACK 1
@@ -46,4 +46,4 @@ int rbtree_insert(rbtree *tree, uint key, void *data, size_t len);
 
 void* rbtree_delete(rbtree *tree, uint key);
 
-#endif /* _COMMON_RBTREE_H */
+#endif /* __RBTREE_H */
diff --git a/src/strbuf.h b/src/strbuf.h
index 6b97a5b..534f976 100644
--- a/src/strbuf.h
+++ b/src/strbuf.h
@@ -8,8 +8,8 @@
  *   (at your option) any later version.
  */
 
-#ifndef __COMMON_STRBUF_H
-#define __COMMON_STRBUF_H
+#ifndef __STRBUF_H
+#define __STRBUF_H
 
 #include <stddef.h>
 
@@ -55,4 +55,4 @@ void strbuf_rev(strbuf_t *s);
 
 void strbuf_squeeze(strbuf_t *s, char ch);
 
-#endif /* __COMMON_STRBUF_H */
+#endif /* __STRBUF_H */
diff --git a/src/util.h b/src/util.h
index 66e0da1..65572b6 100644
--- a/src/util.h
+++ b/src/util.h
@@ -8,8 +8,8 @@
  *   (at your option) any later version.
  */
 
-#ifndef __COMMON_UTIL_H
-#define __COMMON_UTIL_H
+#ifndef __UTIL_H
+#define __UTIL_H
 
 void die(const char *, ...);
 
@@ -17,4 +17,4 @@ void die_errno(const char *);
 
 int file_exists(const char *);
 
-#endif /* __COMMOT_UTIL_H */
+#endif /* __UTIL_H */
diff --git a/src/xalloc.h b/src/xalloc.h
index 9f22a88..fe1900c 100644
--- a/src/xalloc.h
+++ b/src/xalloc.h
@@ -8,8 +8,8 @@
  *   (at your option) any later version.
  */
 
-#ifndef __COMMON_XALLOC_H
-#define __COMMON_XALLOC_H
+#ifndef __XALLOC_H
+#define __XALLOC_H
 
 #include <stddef.h>
 
@@ -25,4 +25,4 @@ void* xmemdup(const void *, size_t);
 
 void xfree(void *);
 
-#endif /* __COMMON_XALLOC_H */
+#endif /* __XALLOC_H */