@@ -1,5 +1,8 @@ 
 (Format: Year/Month/Day)
 Changes for 0.9.10:
+*04/08/31:
+  * Check for C++ std headers, some older machines dont have them (Simon)
+    configure.in  src/<MANY>.hh/cc
 *04/08/30:
   * Changed session.screen<num>.iconbar.clientWidth to
     session.screen<num>.iconbar.iconWidth

@@ -33,6 +33,8 @@ [AC_MSG_ERROR([Your libstdc++ doesn't have the sstream or strstream classes])]
         )]
 )
 
+AC_CHECK_HEADERS(cassert cctype cerrno cmath cstdarg cstdio cstdlib cstring ctime)
+
 AC_HEADER_TIME
 
 dnl Check for existance of basename(), setlocale() and strftime()

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ClientPattern.cc,v 1.7 2004/04/28 13:04:06 rathnor Exp $
+// $Id: ClientPattern.cc,v 1.8 2004/08/31 15:26:38 rathnor Exp $
 
 #include "ClientPattern.hh"
 #include "RegExp.hh"
@@ -38,7 +38,11 @@ #include <iostream>
 #include <fstream>
 #include <string>
 #include <memory>
-#include <cstdio>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
 
 // needed as well for index on some systems (e.g. solaris)
 #include <strings.h> 

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ClockTool.cc,v 1.13 2004/08/29 08:33:12 rathnor Exp $
+// $Id: ClockTool.cc,v 1.14 2004/08/31 15:26:38 rathnor Exp $
 
 #include "ClockTool.hh"
 
@@ -39,7 +39,11 @@ #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <ctime>
+#ifdef HAVE_CTIME
+  #include <ctime>
+#else
+  #include <time.h>
+#endif
 #include <string>
 #include <iostream>
 using namespace std;

@@ -19,13 +19,17 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbAtoms.cc,v 1.9 2003/09/24 14:02:25 rathnor Exp $
+// $Id: FbAtoms.cc,v 1.10 2004/08/31 15:26:38 rathnor Exp $
 
 #include "FbAtoms.hh"
 #include "App.hh"
 
 #include <string>
-#include <cassert>
+#ifdef HAVE_CASSERT
+  #include <cassert>
+#else
+  #include <assert.h>
+#endif
 
 using namespace std;
 

@@ -23,7 +23,11 @@ #include "App.hh"
 
 #include "EventManager.hh"
 
-#include <cassert>
+#ifdef HAVE_CASSERT
+  #include <cassert>
+#else
+  #include <assert.h>
+#endif
 #include <string>
 
 namespace FbTk {

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWindow.cc,v 1.36 2004/06/15 11:03:17 fluxgen Exp $
+// $Id: FbWindow.cc,v 1.37 2004/08/31 15:26:39 rathnor Exp $
 
 #include "FbWindow.hh"
 
@@ -35,7 +35,11 @@ 
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 
-#include <cassert>
+#ifdef HAVE_CASSERT
+  #include <cassert>
+#else
+  #include <assert.h>
+#endif
 
 namespace FbTk {
 

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//$Id: Font.cc,v 1.13 2004/08/28 18:10:19 rathnor Exp $
+//$Id: Font.cc,v 1.14 2004/08/31 15:26:39 rathnor Exp $
 
 
 #include "StringUtil.hh"
@@ -55,8 +55,16 @@ #define __USE_GNU
 #endif //__USE_GNU
 
 #include <iostream> 
-#include <cstring>
-#include <cstdlib>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
 #include <list>
 #include <typeinfo>
 #include <langinfo.h>
@@ -71,7 +79,11 @@ #else
 #error "You dont have sstream or strstream headers!"
 #endif // HAVE_STRSTREAM
 
-#include <cstdlib>
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
 
 using namespace std;
 

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: I18n.cc,v 1.2 2004/06/20 15:16:08 rathnor Exp $
+// $Id: I18n.cc,v 1.3 2004/08/31 15:26:39 rathnor Exp $
 
 /* Note:
  * A good reference for the older non-gettext style I18n
@@ -41,9 +41,21 @@ #include "I18n.hh"
 
 #include <X11/Xlocale.h>
 
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
 
 #include <iostream>
 

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ImageControl.cc,v 1.13 2004/06/07 11:46:05 rathnor Exp $
+// $Id: ImageControl.cc,v 1.14 2004/08/31 15:26:39 rathnor Exp $
 
 #include "ImageControl.hh"
 
@@ -45,9 +45,21 @@ #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif // HAVE_SYS_TYPES_H
 
-#include <cstdlib>
-#include <cstring>
-#include <cstdio>
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
 
 #ifdef HAVE_CTYPE_H
 #include <ctype.h>

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Menu.cc,v 1.78 2004/08/30 10:23:37 akir Exp $
+// $Id: Menu.cc,v 1.79 2004/08/31 15:26:39 rathnor Exp $
 
 //use GNU extensions
 #ifndef	 _GNU_SOURCE
@@ -48,9 +48,21 @@ 
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 #include <iostream>
 #include <typeinfo>
 

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuTheme.cc,v 1.19 2004/08/29 12:33:55 rathnor Exp $
+// $Id: MenuTheme.cc,v 1.20 2004/08/31 15:26:39 rathnor Exp $
 
 #include "MenuTheme.hh"
 
@@ -29,7 +29,11 @@ #include "Font.hh"
 #include "App.hh"
 #include "StringUtil.hh"
 
-#include <cstdio>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
 #include <algorithm>
 
 namespace FbTk {

@@ -19,14 +19,18 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Resource.cc,v 1.6 2004/06/07 11:46:05 rathnor Exp $
+// $Id: Resource.cc,v 1.7 2004/08/31 15:26:39 rathnor Exp $
 
 #include "XrmDatabaseHelper.hh"
 #include "Resource.hh"
 #include "I18n.hh"
 
 #include <iostream>
-#include <cassert>
+#ifdef HAVE_CASSERT
+  #include <cassert>
+#else
+  #include <assert.h>
+#endif
 
 using namespace std;
 

@@ -19,15 +19,31 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: StringUtil.cc,v 1.11 2004/05/02 20:42:56 fluxgen Exp $
+// $Id: StringUtil.cc,v 1.12 2004/08/31 15:26:39 rathnor Exp $
 
 #include "StringUtil.hh"
 
 #include <string>
-#include <cstdio>
-#include <cstdlib>
-#include <cctype>
-#include <cassert>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
+#ifdef HAVE_CCTYPE
+  #include <cctype>
+#else
+  #include <ctype.h>
+#endif
+#ifdef HAVE_CASSERT
+  #include <cassert>
+#else
+  #include <assert.h>
+#endif
 #include <memory>
 #include <algorithm>
 

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: TextBox.cc,v 1.11 2004/08/11 12:41:28 fluxgen Exp $
+// $Id: TextBox.cc,v 1.12 2004/08/31 15:26:39 rathnor Exp $
 
 #include "TextBox.hh"
 #include "Font.hh"
@@ -27,7 +27,11 @@ #include "EventManager.hh"
 #include "App.hh"
 #include "KeyUtil.hh"
 
-#include <cctype>
+#ifdef HAVE_CCTYPE
+  #include <cctype>
+#else
+  #include <ctype.h>
+#endif
 #include <X11/keysym.h>
 #include <X11/Xutil.h>
 

@@ -22,14 +22,22 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Texture.cc,v 1.9 2004/08/26 16:37:48 rathnor Exp $
+// $Id: Texture.cc,v 1.10 2004/08/31 15:26:39 rathnor Exp $
 
 #include "App.hh"
 #include "Texture.hh"
 
 #include <X11/Xlib.h>
-#include <cstring>
-#include <cctype>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
+#ifdef HAVE_CCTYPE
+  #include <cctype>
+#else
+  #include <ctype.h>
+#endif
 
 namespace FbTk {
 

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: TextureRender.cc,v 1.10 2004/07/05 23:51:57 fluxgen Exp $
+// $Id: TextureRender.cc,v 1.11 2004/08/31 15:26:39 rathnor Exp $
 
 #include "TextureRender.hh"
 
@@ -34,7 +34,11 @@ #include "I18n.hh"
 
 #include <iostream>
 #include <string>
-#include <cstdio>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
 using namespace std;
 
 namespace FbTk {

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Theme.cc,v 1.28 2004/08/26 18:26:39 akir Exp $
+// $Id: Theme.cc,v 1.29 2004/08/31 15:26:39 rathnor Exp $
 
 #include "Theme.hh"
 
@@ -30,7 +30,11 @@ #include "ThemeItems.hh"
 #include "Directory.hh"
 #include "I18n.hh"
 
-#include <cstdio>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
 #include <memory>
 #include <iostream>
 

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ThemeItems.hh,v 1.7 2004/08/26 16:37:48 rathnor Exp $
+// $Id: ThemeItems.hh,v 1.8 2004/08/31 15:26:39 rathnor Exp $
 
 /// @file implements common theme items
 
@@ -34,7 +34,11 @@ #include "PixmapWithMask.hh"
 #include "Image.hh"
 
 #include <string>
-#include <cstdio>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
 #include <iostream>
 namespace FbTk {
 

@@ -38,7 +38,11 @@ 
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <cassert>
+#ifdef HAVE_CASSERT
+  #include <cassert>
+#else
+  #include <assert.h>
+#endif
 
 namespace FbTk {
 

@@ -27,7 +27,11 @@ #define	 FBTK_TIMER_HH
 
 #include "RefCount.hh"
 
-#include <ctime> 
+#ifdef HAVE_CTIME
+  #include <ctime>
+#else
+  #include <time.h>
+#endif
 #include <list>
 
 #ifdef HAVE_CONFIG_H

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XFontImp.cc,v 1.8 2004/08/10 11:58:22 fluxgen Exp $
+// $Id: XFontImp.cc,v 1.9 2004/08/31 15:26:39 rathnor Exp $
 
 #include "XFontImp.hh"
 #include "App.hh"
@@ -31,7 +31,11 @@ #include <X11/Xutil.h>
 
 #include <iostream>
 #include <new>
-#include <cstdio>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
 using namespace std;
 
 namespace FbTk {

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XmbFontImp.cc,v 1.9 2004/08/28 18:10:19 rathnor Exp $
+// $Id: XmbFontImp.cc,v 1.10 2004/08/31 15:26:39 rathnor Exp $
 
 #include "XmbFontImp.hh"
 
@@ -38,10 +38,22 @@ #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif // _GNU_SOURCE
 
-#include <cstdio>
-#include <cstdarg>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
+#ifdef HAVE_CSTDARG
+  #include <cstdarg>
+#else
+  #include <stdarg.h>
+#endif
 #include <iostream>
-#include <cstring>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 using namespace std;
 

@@ -19,11 +19,15 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: IntResMenuItem.cc,v 1.3 2004/06/10 17:24:24 fluxgen Exp $
+// $Id: IntResMenuItem.cc,v 1.4 2004/08/31 15:26:38 rathnor Exp $
 
 #include "IntResMenuItem.hh"
 #include "PixmapWithMask.hh"
-#include <cstdio>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
 
 namespace {
 

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//$Id: Keys.cc,v 1.43 2004/06/07 11:46:04 rathnor Exp $
+//$Id: Keys.cc,v 1.44 2004/08/31 15:26:38 rathnor Exp $
 
 
 #include "Keys.hh"
@@ -41,10 +41,26 @@ #ifdef HAVE_CTYPE_H
 #include <ctype.h>
 #endif	// HAVE_CTYPE_H
 
-#include <cstdio>
-#include <cstdlib>
-#include <cerrno>
-#include <cstring>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
+#ifdef HAVE_CERRNO
+  #include <cerrno>
+#else
+  #include <errno.h>
+#endif
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -69,7 +85,11 @@ 
 #include <iostream>
 #include <fstream>
 #include <vector>
-#include <cassert>
+#ifdef HAVE_CASSERT
+  #include <cassert>
+#else
+  #include <assert.h>
+#endif
 #include <memory>
 
 using namespace std;

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Screen.hh,v 1.142 2004/06/21 15:23:42 rathnor Exp $
+// $Id: Screen.hh,v 1.143 2004/08/31 15:26:38 rathnor Exp $
 
 #ifndef	 SCREEN_HH
 #define	 SCREEN_HH
@@ -40,7 +40,11 @@ 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
 
-#include <cstdio>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
 #include <string>
 #include <list>
 #include <vector>

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Shape.cc,v 1.12 2004/08/10 19:34:35 fluxgen Exp $
+// $Id: Shape.cc,v 1.13 2004/08/31 15:26:38 rathnor Exp $
 
 #include "Shape.hh"
 
@@ -28,7 +28,11 @@ #include "FbTk/App.hh"
 #include "FbTk/GContext.hh"
 #include "FbTk/FbPixmap.hh"
 
-#include <cstring>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 #include <X11/Xutil.h>
 #ifdef HAVE_CONFIG_H

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Slit.cc,v 1.97 2004/08/30 11:34:56 akir Exp $
+// $Id: Slit.cc,v 1.98 2004/08/31 15:26:38 rathnor Exp $
 
 #include "Slit.hh"
 
@@ -61,7 +61,11 @@ #include "FbTk/I18n.hh"
 
 #include <algorithm>
 #include <iostream>
-#include <cassert>
+#ifdef HAVE_CASSERT
+  #include <cassert>
+#else
+  #include <assert.h>
+#endif
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/types.h>

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.cc,v 1.150 2004/08/29 12:33:53 rathnor Exp $
+// $Id: Toolbar.cc,v 1.151 2004/08/31 15:26:38 rathnor Exp $
 
 #include "Toolbar.hh"
 
@@ -62,7 +62,11 @@ 
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 
-#include <cstring>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 #include <iterator>
 
 using namespace std;

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WinClient.cc,v 1.41 2004/08/10 13:36:07 fluxgen Exp $
+// $Id: WinClient.cc,v 1.42 2004/08/31 15:26:38 rathnor Exp $
 
 #include "WinClient.hh"
 
@@ -35,7 +35,11 @@ 
 #include <iostream>
 #include <algorithm>
 #include <iterator>
-#include <cassert>
+#ifdef HAVE_CASSERT
+  #include <cassert>
+#else
+  #include <assert.h>
+#endif
 
 using namespace std;
 

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.297 2004/08/29 12:35:29 rathnor Exp $
+// $Id: Window.cc,v 1.298 2004/08/31 15:26:38 rathnor Exp $
 
 #include "Window.hh"
 
@@ -61,10 +61,22 @@ 
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 
-#include <cstring>
-#include <cstdio>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
 #include <iostream>
-#include <cassert>
+#ifdef HAVE_CASSERT
+  #include <cassert>
+#else
+  #include <assert.h>
+#endif
 #include <functional>
 #include <algorithm>
 

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Workspace.cc,v 1.98 2004/06/21 09:53:01 rathnor Exp $
+// $Id: Workspace.cc,v 1.99 2004/08/31 15:26:39 rathnor Exp $
 
 #include "Workspace.hh"
 
@@ -48,8 +48,16 @@ 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
-#include <cstdio>
-#include <cstring>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 #include <algorithm>
 #include <iostream>

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WorkspaceCmd.cc,v 1.12 2004/08/10 12:08:31 fluxgen Exp $
+// $Id: WorkspaceCmd.cc,v 1.13 2004/08/31 15:26:39 rathnor Exp $
 
 #include "WorkspaceCmd.hh"
 
@@ -32,7 +32,11 @@ #include "WinClient.hh"
 
 #include "FbTk/KeyUtil.hh"
 
-#include <cmath>
+#ifdef HAVE_CMATH
+  #include <cmath>
+#else
+  #include <math.h>
+#endif
 #include <algorithm>
 #include <functional>
 #include <iostream>

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: fluxbox.cc,v 1.250 2004/08/27 17:24:49 rathnor Exp $
+// $Id: fluxbox.cc,v 1.251 2004/08/31 15:26:39 rathnor Exp $
 
 #include "fluxbox.hh"
 
@@ -94,9 +94,21 @@ #endif // HAVE_RANDR
 
 // system headers
 
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 
 #ifdef HAVE_UNISTD_H
 #include <sys/types.h>

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: fluxbox.hh,v 1.89 2004/07/15 09:52:14 fluxgen Exp $
+// $Id: fluxbox.hh,v 1.90 2004/08/31 15:26:39 rathnor Exp $
 
 #ifndef	 FLUXBOX_HH
 #define	 FLUXBOX_HH
@@ -36,7 +36,11 @@ 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
 
-#include <cstdio>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: main.cc,v 1.30 2004/06/07 11:46:04 rathnor Exp $
+// $Id: main.cc,v 1.31 2004/08/31 15:26:39 rathnor Exp $
 
 #include "fluxbox.hh"
 #include "version.h"
@@ -38,9 +38,21 @@ #ifndef	 _GNU_SOURCE
 #define	 _GNU_SOURCE
 #endif // _GNU_SOURCE
 
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
 #include <iostream>
 #include <fstream>
 #include <stdexcept>

@@ -28,7 +28,11 @@ #endif // _GNU_SOURCE
 
 #include <string>
 #include <iostream>
-#include <cstdio>
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
 
 using namespace std;
 

@@ -22,7 +22,11 @@ 
 #include "../FbTk/SignalHandler.hh"
 
 #include <iostream>
-#include <cassert>
+#ifdef HAVE_CASSERT
+  #include <cassert>
+#else
+  #include <assert.h>
+#endif
 
 using namespace std;
 using namespace FbTk;

@@ -18,7 +18,7 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 
-// $Id: bsetroot.cc,v 1.21 2004/06/08 13:15:30 rathnor Exp $
+// $Id: bsetroot.cc,v 1.22 2004/08/31 15:26:40 rathnor Exp $
 
 #include "bsetroot.hh"
 
@@ -32,9 +32,21 @@ #endif // HAVE_CONFIG_H
 
 #include <X11/Xatom.h>
 
-#include <cstring>
-#include <cstdlib>
-#include <cstdio>
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
+#ifdef HAVE_CSTDIO
+  #include <cstdio>
+#else
+  #include <stdio.h>
+#endif
 #include <iostream>
 
 using namespace std;

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbRun.cc,v 1.30 2004/04/22 21:01:58 fluxgen Exp $
+// $Id: FbRun.cc,v 1.31 2004/08/31 15:26:40 rathnor Exp $
 
 #include "FbRun.hh"
 
@@ -48,7 +48,11 @@ #include <iostream>
 #include <iterator>
 #include <fstream>
 #include <algorithm>
-#include <cassert>
+#ifdef HAVE_CASSERT
+  #include <cassert>
+#else
+  #include <assert.h>
+#endif
 
 using namespace std;
 FbRun::FbRun(int x, int y, size_t width):