diff --git a/src/wgdb.cc b/src/wgdb.cc
index 68087d4..102455a 100644
--- a/src/wgdb.cc
+++ b/src/wgdb.cc
@@ -3,50 +3,6 @@
 Persistent<Function> Record::constructor;
 Persistent<Function> Cursor::constructor;
 
-/*
- *
- * Structs
- *
-*/
-struct Baton {
-  bool has_cb;
-  Persistent<Function> callback;
-  WgDB* wgdb;
-  const char* error;
-  void* data;
-};
-
-struct FieldData {
-  int field;
-  wg_int enc;
-  Record* record;
-};
-
-struct Fields {
-  int length;
-  wg_int* encs;
-};
-
-struct RecordData {
-  int length;
-  void* record;
-};
-
-struct FindData {
-  int field;
-  wg_int enc;
-  wg_int cond;
-  void* rec;
-  void* data;
-};
-
-struct CursorData {
-  int arglen;
-  wg_query_arg* arglist;
-  wg_query* query;
-};
-
-
 /*
  *
  * Async Functions
diff --git a/src/wgdb.h b/src/wgdb.h
index f29abeb..f0b24f1 100644
--- a/src/wgdb.h
+++ b/src/wgdb.h
@@ -64,4 +64,49 @@ class Cursor : ObjectWrap{
   static void do_after_create_cursor(uv_work_t* req, int status);
 };
 
+
+struct Baton {
+  bool has_cb;
+  Persistent<Function> callback;
+  WgDB* wgdb;
+  const char* error;
+  void* data;
+};
+
+struct FieldData {
+  int field;
+  wg_int enc;
+  Record* record;
+};
+
+struct Fields {
+  int length;
+  wg_int* encs;
+};
+
+struct RecordData {
+  int length;
+  void* record;
+};
+
+struct FindData {
+  int field;
+  wg_int enc;
+  wg_int cond;
+  void* rec;
+  void* data;
+};
+
+struct CursorData {
+  int arglen;
+  wg_query_arg* arglist;
+  wg_query* query;
+};
+
+struct IndexData {
+  int reclen;
+  wg_int* matchrec;
+  int field;
+};
+
 #endif