diff --git a/WINGs/TODO b/WINGs/TODO
index 3008709b..7132ef90 100644
--- a/WINGs/TODO
+++ b/WINGs/TODO
@@ -4,6 +4,9 @@
   Or a delegate to be called when the list selection change.
 - add some way to modify speed when scrolling WMList, depending on how
   far the mouse is moved outside of the list.
+- clean up header files of declared but not implemented anywhere functions
+- implement a generic WMChangeFontAttribute(WMFont *font, enum attributes)
+  function
 
 
 - optimize color allocation for repeated colors
diff --git a/WINGs/WINGs/WINGs.h b/WINGs/WINGs/WINGs.h
index 87b0785f..be40a323 100644
--- a/WINGs/WINGs/WINGs.h
+++ b/WINGs/WINGs/WINGs.h
@@ -1003,7 +1003,7 @@ void WMSetButtonBordered(WMButton *bPtr, int isBordered);
 
 void WMSetButtonEnabled(WMButton *bPtr, Bool flag);
 
-void WMSetButtonImageDimsWhenDisabled(WMButton *bPtr, Bool flag);
+//void WMSetButtonImageDimsWhenDisabled(WMButton *bPtr, Bool flag);
 
 void WMSetButtonTag(WMButton *bPtr, int tag);
 
@@ -1430,8 +1430,6 @@ void WMSetScrollViewContentView(WMScrollView *sPtr, WMView *view);
 
 void WMSetScrollViewRelief(WMScrollView *sPtr, WMReliefType type);
 
-void WMSetScrollViewContentView(WMScrollView *sPtr, WMView *view);
-
 WMRect WMGetScrollViewVisibleRect(WMScrollView *sPtr);
 
 WMScroller* WMGetScrollViewHorizontalScroller(WMScrollView *sPtr);
@@ -1646,13 +1644,13 @@ void WMGetTextBlockProperties(WMText *tPtr, void *vtb, unsigned int *first,
 
 int WMGetTextInsertType(WMText *tPtr);
 
-int WMGetTextBlocks(WMText *tPtr);
+//int WMGetTextBlocks(WMText *tPtr);
 
-void WMSetCurrentTextBlock(WMText *tPtr, int current);
+//void WMSetCurrentTextBlock(WMText *tPtr, int current);
 
-int WMGetCurrentTextBlock(WMText *tPtr); 
+//int WMGetCurrentTextBlock(WMText *tPtr);
 
-void WMPrependTextBlock(WMText *tPtr, void *vtb);
+//void WMPrependTextBlock(WMText *tPtr, void *vtb);
 
 void WMAppendTextBlock(WMText *tPtr, void *vtb);
 
diff --git a/WINGs/WINGs/WUtil.h b/WINGs/WINGs/WUtil.h
index da7ea6ce..f8865752 100644
--- a/WINGs/WINGs/WUtil.h
+++ b/WINGs/WINGs/WUtil.h
@@ -205,9 +205,9 @@ typedef void WMNotificationObserverAction(void *observerData,
 
 /*......................................................................*/
 
-typedef void (waborthandler)(int);
+typedef void waborthandler(int);
 
-waborthandler* wsetabort(waborthandler*);
+waborthandler* wsetabort(waborthandler* handler);
 
 
 /* don't free the returned string */
@@ -680,7 +680,7 @@ void WMSortTree(WMTreeNode *aNode, WMCompareDataProc *comparer);
 WMTreeNode* WMFindInTree(WMTreeNode *aTree, WMMatchDataProc *match, void *cdata);
 
 /* Returns first tree node that has data == cdata */
-#define WMGetFirstInTree(aTree, cdata) WMFindInTree(atree, NULL, cdata)
+#define WMGetFirstInTree(aTree, cdata) WMFindInTree(aTree, NULL, cdata)
 
 
 /*--------------------------------------------------------------------------*/