diff --git a/ChangeLog b/ChangeLog
index 198d7db07a..3438c8f82d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2000-06-15  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* src/text.C (SelectNextWord): protect against null pointers with
+	old-style string streams. (fix from Paul Theo Gonciari
+	<gptheo@yahoo.com>) 
+
+	* src/cite.[Ch]: remove erroneous files.
+
+	* lib/configure.m4: update the list of created directories.
+
+	* src/lyxrow.C: include <config.h>
+	* src/lyxcursor.C: ditto.
+
 2000-06-13  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* lib/examples/decimal.lyx: new example file from Mike.
diff --git a/lib/configure b/lib/configure
index 9a3f0d3c9c..490c41f27d 100755
--- a/lib/configure
+++ b/lib/configure
@@ -70,7 +70,8 @@ fi
 
 
 #### Create the build directories if necessary
-for dir in bind doc kbd layouts templates reLyX ; do
+for dir in bind clipart doc examples images kbd layouts reLyX \
+    scripts templates ; do
   test ! -d $dir && mkdir $dir
 done
 
diff --git a/lib/configure.m4 b/lib/configure.m4
index 5263c06218..07874301a5 100644
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -146,7 +146,8 @@ fi
 
 
 #### Create the build directories if necessary
-for dir in bind doc kbd layouts templates reLyX ; do
+for dir in bind clipart doc examples images kbd layouts reLyX \
+    scripts templates ; do
   test ! -d $dir && mkdir $dir
 done
 
diff --git a/src/cite.C b/src/cite.C
deleted file mode 100644
index 3fd01f66a1..0000000000
--- a/src/cite.C
+++ /dev/null
@@ -1,42 +0,0 @@
-// File modified by fdfix.sh for use by lyx (with xforms 0.81) and gettext
-#include <config.h>
-#include "lyx_gui_misc.h"
-#include "gettext.h"
-
-/* Form definition file generated with fdesign. */
-
-#include FORMS_H_LOCATION
-#include <cstdlib>
-#include "cite.h"
-
-FD_citation_form *create_form_citation_form(void)
-{
-  FL_OBJECT *obj;
-  FD_citation_form *fdui = (FD_citation_form *) fl_calloc(1, sizeof(FD_citation_form));
-
-  fdui->citation_form = fl_bgn_form(FL_NO_BOX, 440, 790);
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 440, 790, "");
-  obj = fl_add_browser(FL_HOLD_BROWSER, 20, 40, 170, 370, _("Inset keys"));
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-  obj = fl_add_browser(FL_HOLD_BROWSER, 250, 40, 170, 370, _("Bibliography keys"));
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-  obj = fl_add_button(FL_NORMAL_BUTTON, 200, 40, 40, 40, _("@4->"));
-  obj = fl_add_button(FL_NORMAL_BUTTON, 200, 90, 40, 40, _("@9+"));
-  obj = fl_add_button(FL_NORMAL_BUTTON, 200, 140, 40, 40, _("@8->"));
-  obj = fl_add_button(FL_NORMAL_BUTTON, 200, 190, 40, 40, _("@2->"));
-  obj = fl_add_browser(FL_NORMAL_BROWSER, 20, 440, 400, 110, _("Info"));
-    fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
-  obj = fl_add_choice(FL_NORMAL_CHOICE, 160, 570, 130, 30, _("Citation style"));
-    fl_set_object_boxtype(obj, FL_DOWN_BOX);
-  obj = fl_add_input(FL_NORMAL_INPUT, 100, 620, 250, 30, _("Text before"));
-  obj = fl_add_input(FL_NORMAL_INPUT, 100, 660, 250, 30, _("Text after"));
-  obj = fl_add_button(FL_RETURN_BUTTON, 190, 730, 110, 40, _("OK"));
-  obj = fl_add_button(FL_NORMAL_BUTTON, 310, 730, 110, 40, _("Cancel"));
-  fl_end_form();
-
-  //fdui->citation_form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
diff --git a/src/cite.h b/src/cite.h
deleted file mode 100644
index 27ae828496..0000000000
--- a/src/cite.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/** Header file generated with fdesign on Mon Jun 12 06:32:31 2000.**/
-
-#ifndef FD_citation_form_h_
-#define FD_citation_form_h_
-
-/** Callbacks, globals and object handlers **/
-
-
-/**** Forms and Objects ****/
-typedef struct {
-	FL_FORM *citation_form;
-	void *vdata;
-	char *cdata;
-	long  ldata;
-} FD_citation_form;
-
-extern FD_citation_form * create_form_citation_form(void);
-
-#endif /* FD_citation_form_h_ */
diff --git a/src/lyxcursor.C b/src/lyxcursor.C
index acdad00eec..098b385689 100644
--- a/src/lyxcursor.C
+++ b/src/lyxcursor.C
@@ -8,6 +8,8 @@
  *
  * ====================================================== */
 
+#include <config.h>
+
 #include "lyxcursor.h"
 
 
diff --git a/src/lyxrow.C b/src/lyxrow.C
index ec8261cccf..497748628f 100644
--- a/src/lyxrow.C
+++ b/src/lyxrow.C
@@ -8,6 +8,8 @@
  *
  * ====================================================== */
 
+#include <config.h>
+
 #include "lyxrow.h"
 
 
diff --git a/src/text.C b/src/text.C
index d4ea265ceb..c16548a436 100644
--- a/src/text.C
+++ b/src/text.C
@@ -3222,7 +3222,8 @@ char * LyXText::SelectNextWord(BufferView * bview, float & value)
 #ifdef HAVE_SSTREAM
 		       && latex.str() == "\\-"
 #else
-		&& string(latex.str(), 3) == "\\-" // this is not nice at all
+		       && latex.str() // protect against null pointers	       
+		       && string(latex.str(), 3) == "\\-" // this is not nice at all
 #endif
 			   ))
 		cursor.pos(cursor.pos() + 1);