diff --git a/src/E.h b/src/E.h
index 3f966100..0aeef9b9 100644
--- a/src/E.h
+++ b/src/E.h
@@ -996,17 +996,10 @@ char               *field(char *s, int fieldno);
 void                fword(char *s, int num, char *wd);
 
 /* finders.c */
-EWin               *EwinFindByPtr(const EWin * ewin);
-EWin               *EwinFindByFrame(Window win);
-EWin               *EwinFindByClient(Window win);
-EWin               *EwinFindByChildren(Window win);
-EWin               *EwinFindByString(const char *win, int type);
-
-Group             **ListWinGroups(EWin * ewin, char group_select, int *num);
-EWin              **ListWinGroupMembersForEwin(EWin * ewin, int action,
+Group             **ListWinGroups(const EWin * ewin, char group_select,
+				  int *num);
+EWin              **ListWinGroupMembersForEwin(const EWin * ewin, int action,
 					       char nogroup, int *num);
-EWin              **EwinListTransients(EWin * ewin, int *num, int group);
-EWin              **EwinListTransientFor(EWin * ewin, int *num);
 
 /* focus.c */
 #define FOCUS_NOP         0
diff --git a/src/ewins.h b/src/ewins.h
index ba806c85..b2b48aac 100644
--- a/src/ewins.h
+++ b/src/ewins.h
@@ -328,6 +328,15 @@ void                EwinOpSetOpacity(EWin * ewin, int opacity);
 void                EwinOpMoveToDesk(EWin * ewin, struct _desk *dsk, int inc);
 void                EwinOpMoveToArea(EWin * ewin, int x, int y);
 
+/* finders.c */
+EWin               *EwinFindByPtr(const EWin * ewin);
+EWin               *EwinFindByFrame(Window win);
+EWin               *EwinFindByClient(Window win);
+EWin               *EwinFindByChildren(Window win);
+EWin               *EwinFindByString(const char *win, int type);
+EWin              **EwinListTransients(const EWin * ewin, int *num, int group);
+EWin              **EwinListTransientFor(const EWin * ewin, int *num);
+
 /* stacking.c */
 EWin               *const *EwinListStackGet(int *num);
 EWin               *const *EwinListFocusGet(int *num);
diff --git a/src/finders.c b/src/finders.c
index 63f27d06..054be0a5 100644
--- a/src/finders.c
+++ b/src/finders.c
@@ -141,7 +141,7 @@ EwinFindByString(const char *match, int type)
 }
 
 Group             **
-ListWinGroups(EWin * ewin, char group_select, int *num)
+ListWinGroups(const EWin * ewin, char group_select, int *num)
 {
    Group             **groups = NULL;
    Group             **groups2 = NULL;
@@ -190,7 +190,8 @@ ListWinGroups(EWin * ewin, char group_select, int *num)
 }
 
 EWin              **
-ListWinGroupMembersForEwin(EWin * ewin, int action, char nogroup, int *num)
+ListWinGroupMembersForEwin(const EWin * ewin, int action, char nogroup,
+			   int *num)
 {
 
    EWin              **gwins = NULL;
@@ -202,7 +203,7 @@ ListWinGroupMembersForEwin(EWin * ewin, int action, char nogroup, int *num)
 	if (nogroup)
 	  {
 	     gwins = Emalloc(sizeof(EWin *));
-	     gwins[0] = ewin;
+	     gwins[0] = (EWin *) ewin;
 	     *num = 1;
 	     return gwins;
 	  }
@@ -281,7 +282,7 @@ ListWinGroupMembersForEwin(EWin * ewin, int action, char nogroup, int *num)
 	if ((*num) == 0)
 	  {
 	     gwins = Emalloc(sizeof(EWin *));
-	     gwins[0] = ewin;
+	     gwins[0] = (EWin *) ewin;
 	     *num = 1;
 	  }
 	return gwins;
@@ -294,7 +295,7 @@ ListWinGroupMembersForEwin(EWin * ewin, int action, char nogroup, int *num)
 }
 
 EWin              **
-EwinListTransients(EWin * ewin, int *num, int group)
+EwinListTransients(const EWin * ewin, int *num, int group)
 {
    EWin               *const *ewins, **lst, *ew;
    int                 i, j, n;
@@ -352,7 +353,7 @@ EwinListTransients(EWin * ewin, int *num, int group)
 }
 
 EWin              **
-EwinListTransientFor(EWin * ewin, int *num)
+EwinListTransientFor(const EWin * ewin, int *num)
 {
    EWin               *const *ewins, **lst, *ew;
    int                 i, j, n;