3 files changed, 23 insertions, 31 deletions
diff --git a/src/include/fileops.h b/src/include/fileops.h
deleted file mode 100644
index 371f6e8..0000000
--- a/src/include/fileops.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef FILEOPS_H
-#define FILEOPS_H
-
-#include "keytab.h"
-
-unsigned char *readdb(char *filename);
-void writedb(char *filename, struct keytablist *list, int len);
-
-#endif
diff --git a/src/include/keytab.h b/src/include/mdb.h
index 7e15643..6e6fca9 100644
--- a/src/include/keytab.h
+++ b/src/include/mdb.h
@@ -1,8 +1,24 @@
-#ifndef KEYTAB_H
-#define KEYTAB_H
+#ifndef FILEOPS_H
+#define FILEOPS_H
 
 #define TABLEN 1024
 
+extern int blen;
+
+enum btype {
+  BEGIN = 1,
+  END, PAIR,
+
+  ERROR
+};
+
+struct byte {
+  enum btype type;
+  char *value;
+};
+
+struct byte *parse(unsigned char *buf);
+
 union value {
   char *str;
   double num;
@@ -24,4 +40,9 @@ struct keytab getkey(struct keytablist *list, int id, char *key);
 void setkey(struct keytablist **list, int *len, int id, char *pair);
 void delkey(struct keytablist *list, int id, char *key);
 
+// TODO: integrate every header into single file
+// TODO: make readdb return struct keytab list*
+unsigned char *readdb(char *filename);
+void writedb(char *filename, struct keytablist *list, int len);
+
 #endif
diff --git a/src/include/parser.h b/src/include/parser.h
deleted file mode 100644
index 25045ae..0000000
--- a/src/include/parser.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef PARSER_H
-#define PARSER_H
-
-extern int blen;
-
-enum btype {
-  BEGIN = 1,
-  END, PAIR,
-
-  ERROR
-};
-
-struct byte {
-  enum btype type;
-  char *value;
-};
-
-struct byte *parse(unsigned char *buf);
-
-#endif