diff --git a/src/Makefile.subdir b/src/Makefile.subdir
index 81244c7694ef3e5faa3b42182ae60b99b85e3bb3..3535f0309c646265b60f80501d1a33e3353c588e 100644
--- a/src/Makefile.subdir
+++ b/src/Makefile.subdir
@@ -1,32 +1,40 @@
 noinst_HEADERS += \
-  src/log.h \
+  src/args-read-actions.h \
+  src/args-write-actions.h \
+  src/buffer-union.h \
   src/completion.h \
-  src/write-op-impl.h \
-  src/write-actions.h \
-  src/read-op-impl.h \
+  src/log.h \
+  src/omap-iter-impl.h \
+  src/prepare-read-op.h \
+  src/prepare-write-op.h \
+  src/proc-omap-iter.h \
+  src/proc-read-actions.h \
+  src/proc-read-responses.h \
+  src/proc-write-actions.h \
   src/read-actions.h \
+  src/read-op-impl.h \
+  src/read-op-visitor.h \
+  src/read-resp-impl.h \
   src/utlist.h \
-  src/proc-write-actions.h \
-  src/proc-read-actions.h \
-  src/prepare-write-op.h \
-  src/prepare-read-op.h \
-  src/write-op-visitor.h \
-  src/buffer-union.h \
-  src/args-write-actions.h \
-  src/args-read-actions.h \
-  src/read-op-visitor.h
+  src/write-actions.h \
+  src/write-op-impl.h \
+  src/write-op-visitor.h 
 
 src_libmobject_store_la_SOURCES = \
-  src/libmobject-store.c \
   src/completion.c \
-  src/write-op-impl.c \
-  src/read-op-impl.c \
-  src/proc-write-actions.c \
-  src/proc-read-actions.c \
-  src/prepare-write-op.c \
+  src/libmobject-store.c \
+  src/omap-iter-impl.c \
   src/prepare-read-op.c \
-  src/write-op-visitor.c \
-  src/read-op-visitor.c
+  src/prepare-write-op.c \
+  src/proc-omap-iter.c \
+  src/proc-read-actions.c \
+  src/proc-read-responses.c \
+  src/proc-write-actions.c \
+  src/read-op-impl.c \
+  src/read-op-visitor.c \
+  src/read-resp-impl.c \
+  src/write-op-impl.c \
+  src/write-op-visitor.c
 
 src_libmobject_server_la_SOURCES = \
   src/mobject-server.c