diff --git a/src/attrib-server.c b/src/attrib-server.c
index fcc6601..3b94120 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -50,6 +50,7 @@
 #include "attrib/att.h"
 #include "attrib/gatt.h"
 #include "attrib/att-database.h"
+#include "textfile.h"
 #include "storage.h"
 
 #include "attrib-server.h"
diff --git a/src/device.c b/src/device.c
index b069a1a..797f36b 100644
--- a/src/device.c
+++ b/src/device.c
@@ -62,6 +62,7 @@
 #include "sdp-client.h"
 #include "attrib/gatt.h"
 #include "agent.h"
+#include "textfile.h"
 #include "storage.h"
 #include "attrib-server.h"
 
diff --git a/src/storage.h b/src/storage.h
index 4c5ab50..1c0ad57 100644
--- a/src/storage.h
+++ b/src/storage.h
@@ -21,8 +21,6 @@
  *
  */
 
-#include "textfile.h"
-
 int read_discoverable_timeout(const char *src, int *timeout);
 int read_pairable_timeout(const char *src, int *timeout);
 int read_on_mode(const char *src, char *mode, int length);
diff --git a/src/textfile.h b/src/textfile.h
index b779bd2..f01629e 100644
--- a/src/textfile.h
+++ b/src/textfile.h
@@ -21,9 +21,6 @@
  *
  */
 
-#ifndef __TEXTFILE_H
-#define __TEXTFILE_H
-
 int create_file(const char *filename, const mode_t mode);
 int create_name(char *buf, size_t size, const char *path,
 				const char *address, const char *name);
@@ -35,5 +32,3 @@ char *textfile_get(const char *pathname, const char *key);
 typedef void (*textfile_cb) (char *key, char *value, void *data);
 
 int textfile_foreach(const char *pathname, textfile_cb func, void *data);
-
-#endif /* __TEXTFILE_H */