diff --git a/ChangeLog b/ChangeLog
index 7af16e7e..697def2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.2:
+*03/04/27
+   * Fix cassert #includes (Simon)
+     Window.cc WinClient.cc FbRun.cc signaltest.cc
 *03/04/26:
    * Add remember layer (Simon)
      Remember.hh/cc
diff --git a/src/WinClient.cc b/src/WinClient.cc
index 7f154765..6a414345 100644
--- a/src/WinClient.cc
+++ b/src/WinClient.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WinClient.cc,v 1.4 2003/04/25 11:21:17 fluxgen Exp $
+// $Id: WinClient.cc,v 1.5 2003/04/27 02:26:21 rathnor Exp $
 
 #include "WinClient.hh"
 
@@ -33,6 +33,8 @@
 #include <iostream>
 #include <algorithm>
 #include <iterator>
+#include <cassert>
+
 using namespace std;
 
 WinClient::WinClient(Window win, FluxboxWindow &fbwin):FbTk::FbWindow(win),
diff --git a/src/Window.cc b/src/Window.cc
index b6e29c7d..d148cdc3 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.149 2003/04/26 05:42:35 rathnor Exp $
+// $Id: Window.cc,v 1.150 2003/04/27 02:26:21 rathnor Exp $
 
 #include "Window.hh"
 
@@ -55,7 +55,7 @@
 #include <cstring>
 #include <cstdio>
 #include <iostream>
-
+#include <cassert>
 
 using namespace std;
 
diff --git a/src/tests/signaltest.cc b/src/tests/signaltest.cc
index 27f82ebf..8ac7d902 100644
--- a/src/tests/signaltest.cc
+++ b/src/tests/signaltest.cc
@@ -22,6 +22,7 @@
 #include "../SignalHandler.hh"
 
 #include <iostream>
+#include <cassert>
 
 using namespace std;
 using namespace FbTk;
diff --git a/util/fbrun/FbRun.cc b/util/fbrun/FbRun.cc
index 2d5499a6..992255f8 100644
--- a/util/fbrun/FbRun.cc
+++ b/util/fbrun/FbRun.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbRun.cc,v 1.10 2003/03/22 11:33:04 fluxgen Exp $
+// $Id: FbRun.cc,v 1.11 2003/04/27 02:26:21 rathnor Exp $
 
 #include "FbRun.hh"
 
@@ -36,6 +36,7 @@
 
 #include <iostream>
 #include <fstream>
+#include <cassert>
 
 using namespace std;
 FbRun::FbRun(int x, int y, size_t width):