5,7d4
< #include "list.h"
< #include "defs.h"
< #include "init.h"
9,10c6,9
< static int
< compare_grouplists(CLASS *c1, CLASS *c2) {
---
> #include "aggregate.h"
> 
> // extern inlined
> int compare_grouplists(TIMBER_CLASS *c1, TIMBER_CLASS *c2) {
17a17
> 
35,37c35,36
< static CLASS
< *aggregate_find_match_class(LIST_PTR *l, CLASS *c) {
< 	CLASS	*test;
---
> TIMBER_CLASS* aggregate_find_match_class(LIST_PTR *l, TIMBER_CLASS *c) {
> 	TIMBER_CLASS	*test;
40c39
< 	test = (CLASS *)list_next(l);
---
> 	test = (TIMBER_CLASS *)list_next(l);
52c51
< 		test = (CLASS *)list_next(l);
---
> 		test = (TIMBER_CLASS *)list_next(l);
57,58c56,57
< void
< aggregate(int period) {
---
> 
> void aggregate(int period) {
61c60
< 	CLASS	*class, *test;
---
> 	TIMBER_CLASS	*timber_class, *test;
73c72
< 			/* fill new class list */
---
> 			/* fill new timber_class list */
76,78c75,77
< 			class = (CLASS *)list_next(au->classlist);
< 			while (class!=NULL) {
< 				if (class->class_type!=INACTIVE) {
---
> 			timber_class = (TIMBER_CLASS *)list_next(au->classlist);
> 			while (timber_class!=NULL) {
> 				if (timber_class->class_type!=INACTIVE) {
80,83c79,82
< 					list_done(class->floatgrouplist);
< 					class->floatgrouplist=NULL;
< 					/* find like class */
< 					test = (CLASS *)aggregate_find_match_class(newclasslist, class);
---
> 					list_done(timber_class->floatgrouplist);
> 					timber_class->floatgrouplist=NULL;
> 					/* find like timber_class */
> 					test = (TIMBER_CLASS *)aggregate_find_match_class(newclasslist, timber_class);
85c84
< 						newclasslist = (LIST_PTR *)list_insert(newclasslist, class, class->age);
---
> 						newclasslist = (LIST_PTR *)list_insert(newclasslist, timber_class, timber_class->age);
87,88c86,87
< 						test->area += class->area;
< 						init_delete_class(class);
---
> 						test->area += timber_class->area;
> 						init_delete_class(timber_class);
91c90
< 				class = (CLASS *)list_next(au->classlist);
---
> 				timber_class = (TIMBER_CLASS *)list_next(au->classlist);