X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.c;fp=merge.c;h=7f1773eca706e8d0cfa4b7def3c83e54e78a24c3;hb=5913c95f2c7abf4c3cb06e27d384d80fb4c83547;hp=8d870a22ced90791037d3bfd0d5f33410de09237;hpb=f86410ff8aa00dc5c584541f387f77515a8cbd89;p=onak.git

diff --git a/merge.c b/merge.c
index 8d870a2..7f1773e 100644
--- a/merge.c
+++ b/merge.c
@@ -10,9 +10,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "decodekey.h"
 #include "keydb.h"
 #include "keyid.h"
-#include "keyindex.h"
 #include "keystructs.h"
 #include "ll.h"
 #include "mem.h"