diff --git a/legacy/elementary/src/bin/Makefile.am b/legacy/elementary/src/bin/Makefile.am
index 85ae36e67f..4019795d1e 100644
--- a/legacy/elementary/src/bin/Makefile.am
+++ b/legacy/elementary/src/bin/Makefile.am
@@ -51,7 +51,6 @@ test_cursor.c \
 test_datetime.c \
 test_diskselector.c \
 test_entry.c \
-test_factory.c \
 test_fileselector_button.c \
 test_fileselector.c \
 test_fileselector_entry.c \
@@ -194,3 +193,6 @@ elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la \
 elementary_testql_CFLAGS = -DELM_LIB_QUICKLAUNCH=1
 elementary_testql_LDFLAGS =
 endif
+
+EXTRA_DIST = \
+test_factory.c
diff --git a/legacy/elementary/src/bin/test.c b/legacy/elementary/src/bin/test.c
index 1c965d264d..709b597b28 100644
--- a/legacy/elementary/src/bin/test.c
+++ b/legacy/elementary/src/bin/test.c
@@ -162,7 +162,7 @@ void test_glview_simple(void *data, Evas_Object *obj, void *event_info);
 void test_glview(void *data, Evas_Object *obj, void *event_info);
 void test_3d(void *data, Evas_Object *obj, void *event_info);
 void test_naviframe(void *data, Evas_Object *obj, void *event_info);
-void test_factory(void *data, Evas_Object *obj, void *event_info);
+//void test_factory(void *data, Evas_Object *obj, void *event_info);
 void test_datetime(void *data, Evas_Object *obj, void *event_info);
 #ifdef HAVE_EMOTION
 void test_video(void *data, Evas_Object *obj, void *event_info);
@@ -543,7 +543,7 @@ add_tests:
 
    //------------------------------//
    ADD_TEST(NULL, "Helpers", "Store", test_store);
-   ADD_TEST(NULL, "Helpers", "Factory", test_factory);
+//   ADD_TEST(NULL, "Helpers", "Factory", test_factory);
 
    //------------------------------//
    ADD_TEST(NULL, "Micellaneous", "Copy And Paste", test_cnp);
diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index 4a1935cf4e..bbcb7f6a94 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -163,7 +163,7 @@ EAPI extern Elm_Version *elm_version;
 
 /* other includes */
 // Tom Hacohen
-#include <elc_anchorblock.h> // <-- up to here (1.0 review)
+#include <elc_anchorblock.h>
 #include <elc_anchorview.h>
 #include <elc_ctxpopup.h>
 #include <elc_fileselector_button.h>
@@ -178,39 +178,39 @@ EAPI extern Elm_Version *elm_version;
 #include <elm_box.h>
 
 // Daniel Juyung Seo
-#include <elm_bubble.h> // XXX: comments in elm_bubble.h
+#include <elm_bubble.h> // OK
 #include <elm_button.h> // OK
-#include <elm_cache.h> // XXX: comments in elm_cache.h
-#include <elm_calendar.h> // XXX: comments in elm_calendar.h. review was not finished.
+#include <elm_cache.h> // OK
+#include <elm_calendar.h> // OK
 #include <elm_check.h> // OK
 #include <elm_clock.h>
-#include <elm_cnp.h> // XXX: comments in elm_cnp.h
+#include <elm_cnp.h> // OK
 #include <elm_colorselector.h> // OK
 #include <elm_config.h>
-#include <elm_conform.h> // XXX: comments in elm_conform.h
-#include <elm_cursor.h> // XXX: comments in elm_cursor.h. review was not finished.
-#include <elm_datetime.h>
+#include <elm_conform.h> // OK
+#include <elm_cursor.h> // OK
+#include <elm_datetime.h> // OK
 #include <elm_debug.h> // OK
 #include <elm_diskselector.h>
 
 // Chuneon Park
-#include <elm_engine.h>  //Done
-#include <elm_factory.h>  //Done + XXX in header
-#include <elm_finger.h> //Done
-#include <elm_flip.h> //Done. There are many TODOs in flip.c
-#include <elm_flipselector.h> //Done + XXX in header. There are many TODOs in flipselector.c
-#include <elm_focus.h>  //Done + XXX in header
-#include <elm_fonts.h> //Done + XXX in header
-#include <elm_frame.h> //Done + XXX in header
-#include <elm_gengrid.h> //Done + XXX in header
-#include <elm_genlist.h> //Done + XXX in headers. 
-#include <elm_gesture_layer.h> //Done
-#include <elm_glview.h> //Done + XXX in header, insufficient doc.
-#include <elm_grid.h> //Done
+#include <elm_engine.h>  // OK
+//#include <elm_factory.h>  // OK
+#include <elm_finger.h> // OK
+#include <elm_flip.h> // OK
+#include <elm_flipselector.h> // OK
+#include <elm_focus.h>  // OK
+#include <elm_fonts.h> // OK
+#include <elm_frame.h> // OK
+#include <elm_gengrid.h> // OK
+#include <elm_genlist.h> // OK
+#include <elm_gesture_layer.h> // OK
+#include <elm_glview.h> // OK
+#include <elm_grid.h> // OK
 
 // Woohyun Jung
-#include <elm_hover.h> // XXX: needs to change one API 
-#include <elm_image.h> // XXX: some API names are ambiguous
+#include <elm_hover.h>
+#include <elm_image.h>
 #include <elm_index.h> // OK
 #include <elm_label.h> // OK
 #include <elm_layout.h> // OK
@@ -242,13 +242,13 @@ EAPI extern Elm_Version *elm_version;
 #include <elm_slider.h> // OK
 #include <elm_slideshow.h> // OK
 #include <elm_spinner.h> // OK
-#include <elm_store.h> // XXX: needs docs
+#include <elm_store.h> // OK
 #include <elm_table.h> // OK
 #include <elm_theme.h> // OK
 #include <elm_thumb.h> // OK
 #include <elm_toolbar.h> // OK
 #include <elm_transit.h> // OK
-#include <elm_video.h> // XXX: needs work. see elm_video.h
+#include <elm_video.h> // OK
 #include <elm_web.h>
 #include <elm_win.h> // OK
 
diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am
index ac58bc02ca..43917f2d81 100644
--- a/legacy/elementary/src/lib/Makefile.am
+++ b/legacy/elementary/src/lib/Makefile.am
@@ -77,7 +77,6 @@ elm_deprecated_before.h \
 elm_diskselector.h \
 elm_engine.h \
 elm_entry.h \
-elm_factory.h \
 elm_finger.h \
 elm_flip.h \
 elm_flipselector.h \
@@ -166,7 +165,6 @@ elm_conform.c \
 elm_datetime.c \
 elm_diskselector.c \
 elm_entry.c \
-elm_factory.c \
 elm_flip.c \
 elm_flipselector.c \
 elm_font.c \
@@ -253,3 +251,7 @@ libelementary_la_LIBADD = \
 libelementary_la_LDFLAGS = \
 -no-undefined @lt_enable_auto_import@ \
 -version-info @version_info@ @release_info@
+
+EXTRA_DIST = \
+elm_factory.h \
+elm_factory.c
diff --git a/legacy/elementary/src/lib/elm_factory.h b/legacy/elementary/src/lib/elm_factory.h
index 82fc1baaab..a81ba5efcc 100644
--- a/legacy/elementary/src/lib/elm_factory.h
+++ b/legacy/elementary/src/lib/elm_factory.h
@@ -1,5 +1,6 @@
+/* this api is currently disabled due to being incomplete. you cannot
+ * use it as it is not compiled in */
 EAPI Evas_Object                 *elm_factory_add(Evas_Object *parent);
-//XXX: api name sounds uncertain.
 EAPI void                         elm_factory_maxmin_mode_set(Evas_Object *obj, Eina_Bool enabled);
 EAPI Eina_Bool                    elm_factory_maxmin_mode_get(const Evas_Object *obj);
 EAPI void                         elm_factory_maxmin_reset_set(Evas_Object *obj);
diff --git a/legacy/elementary/src/lib/elm_store.h b/legacy/elementary/src/lib/elm_store.h
index aff4de6ccc..fd6a899916 100644
--- a/legacy/elementary/src/lib/elm_store.h
+++ b/legacy/elementary/src/lib/elm_store.h
@@ -1,3 +1,4 @@
+// XXX: need docs!
 typedef struct _Elm_Store                      Elm_Store;
 typedef struct _Elm_Store_Filesystem           Elm_Store_Filesystem;
 typedef struct _Elm_Store_Item                 Elm_Store_Item;