diff --git a/src/zmapWindow/items/zmapWindowCanvasItem.h b/src/zmapWindow/items/zmapWindowCanvasItem.h
index 2f3ef569798c16b3c8ab5d9b640a081fd32773c4..aececaa860f0c2838ac4421b42800453b909887a 100755
--- a/src/zmapWindow/items/zmapWindowCanvasItem.h
+++ b/src/zmapWindow/items/zmapWindowCanvasItem.h
@@ -27,12 +27,11 @@
  *
  * Exported functions: See XXXXXXXXXXXXX.h
  * HISTORY:
- * Last edited: Jan 22 13:58 2010 (edgrif)
+ * Last edited: Feb 15 17:45 2010 (edgrif)
  * Created: Wed Dec  3 08:21:03 2008 (rds)
- * CVS info:   $Id: zmapWindowCanvasItem.h,v 1.8 2010-01-22 13:58:41 edgrif Exp $
+ * CVS info:   $Id: zmapWindowCanvasItem.h,v 1.9 2010-02-16 10:21:46 edgrif Exp $
  *-------------------------------------------------------------------
  */
-
 #ifndef ZMAP_WINDOW_CANVAS_ITEM_H
 #define ZMAP_WINDOW_CANVAS_ITEM_H
 
@@ -44,6 +43,7 @@
 #include <zmapWindowLongItem.h>
 #include <zmapWindowTextItem.h>
 
+
 /* This still gets added as a g_object_set_data on FooCanvasItem objects. */
 #define ITEM_SUBFEATURE_DATA  "item_subfeature_data"
 
@@ -120,13 +120,5 @@ void zMapWindowCanvasItemReparent(FooCanvasItem *item, FooCanvasGroup *new_group
 
 ZMapWindowCanvasItem zMapWindowCanvasItemDestroy(ZMapWindowCanvasItem canvas_item);
 
-#include <zmapWindowAssemblyFeature.h>
-#include <zmapWindowBasicFeature.h>
-#include <zmapWindowTranscriptFeature.h>
-#include <zmapWindowAlignmentFeature.h>
-#include <zmapWindowTextFeature.h>
-#include <zmapWindowSequenceFeature.h>
-
-#include <zmapWindowCollectionFeature.h>
 
 #endif /* ZMAP_WINDOW_CANVAS_ITEM_H */
diff --git a/src/zmapWindow/items/zmapWindowCollectionFeature.c b/src/zmapWindow/items/zmapWindowCollectionFeature.c
index 4a0f78353338be0d68c6c90ec6d0d1c4e03907a1..aeba62d108f49505e491fa73029fdf5ec5453cd5 100755
--- a/src/zmapWindow/items/zmapWindowCollectionFeature.c
+++ b/src/zmapWindow/items/zmapWindowCollectionFeature.c
@@ -27,19 +27,13 @@
  *
  * Exported functions: See XXXXXXXXXXXXX.h
  * HISTORY:
- * Last edited: Jan 27 13:55 2010 (edgrif)
+ * Last edited: Feb 16 10:22 2010 (edgrif)
  * Created: Wed Dec  3 10:02:22 2008 (rds)
- * CVS info:   $Id: zmapWindowCollectionFeature.c,v 1.13 2010-01-27 14:00:19 edgrif Exp $
+ * CVS info:   $Id: zmapWindowCollectionFeature.c,v 1.14 2010-02-16 10:23:13 edgrif Exp $
  *-------------------------------------------------------------------
  */
-
 #include <math.h>
 #include <zmapWindowCollectionFeature_I.h>
-#include <zmapWindowContainerGroup.h>
-#include <zmapWindowContainerFeatureSet.h>
-#include <zmapWindowContainerUtils.h>
-#include <zmapWindowLongItem.h>
-
 
 typedef enum {FIRST_MATCH, LAST_MATCH} MatchType ;
 
diff --git a/src/zmapWindow/items/zmapWindowCollectionFeature_I.h b/src/zmapWindow/items/zmapWindowCollectionFeature_I.h
index 4edfb9fb65106559dbc3e0c7a039d7b74054d677..a7ca0eb37c9318afac53b196674871950e0ed4c0 100755
--- a/src/zmapWindow/items/zmapWindowCollectionFeature_I.h
+++ b/src/zmapWindow/items/zmapWindowCollectionFeature_I.h
@@ -27,17 +27,16 @@
  *
  * Exported functions: See XXXXXXXXXXXXX.h
  * HISTORY:
- * Last edited: Jan 25 14:15 2009 (rds)
+ * Last edited: Feb 15 15:49 2010 (edgrif)
  * Created: Wed Dec  3 08:25:28 2008 (rds)
- * CVS info:   $Id: zmapWindowCollectionFeature_I.h,v 1.1 2009-04-23 09:12:46 rds Exp $
+ * CVS info:   $Id: zmapWindowCollectionFeature_I.h,v 1.2 2010-02-16 10:24:31 edgrif Exp $
  *-------------------------------------------------------------------
  */
-
 #ifndef ZMAP_WINDOW_COLLECTION_FEATURE_I_H
 #define ZMAP_WINDOW_COLLECTION_FEATURE_I_H
 
 #include <zmapWindowCanvasItem_I.h>
-
+#include <zmapWindowCollectionFeature.h>
 
 typedef struct _zmapWindowCollectionFeatureClassStruct
 {