diff --git a/ChangeLog b/ChangeLog
index e56ecd0a4c..a1ad739a1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2000-06-13  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* src/Timeout.C (TimeOut): remove default argument.
+
+	* src/LyXView.C (LyXView_AutosaveTimerCB): this should not have
+	"C" linkage.
+
+	* src/insets/ExternalTemplate.C: add a "using" directive.
+
+	* src/lyx_main.h: remove the act_ struct, which seems unused
+	anyway. 
+
 2000-06-12  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
 	* LyX Developers Meeting: All files changed, due to random C++ (by
diff --git a/src/LyXView.C b/src/LyXView.C
index 29d6ae71a0..7c2c426bf2 100644
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -158,13 +158,11 @@ void LyXView::AutoSave()
 
 
 // Wrapper for the above
-extern "C" {
-	static
-	void C_LyXView_AutosaveTimerCB(void * ob)
-	{
-		LyXView * view = static_cast<LyXView*>(ob);
-		view->AutoSave();
-	}
+static
+void LyXView_AutosaveTimerCB(void * ob)
+{
+	LyXView * view = static_cast<LyXView*>(ob);
+	view->AutoSave();
 }
 
 /// Reset autosave timer
@@ -265,7 +263,7 @@ void LyXView::create_form_form_main(int width, int height)
 	// TIMERS
 	//
 
-	autosave_timeout.callback(C_LyXView_AutosaveTimerCB, this);
+	autosave_timeout.callback(LyXView_AutosaveTimerCB, this);
 
 	//
 	// Misc
diff --git a/src/Timeout.C b/src/Timeout.C
index 1f402423c1..fc0a8c5045 100644
--- a/src/Timeout.C
+++ b/src/Timeout.C
@@ -22,7 +22,7 @@ Timeout::Timeout()
 	 callback_(0), data_(0) {}
 
 
-Timeout::Timeout(int msec, Type t = ONETIME)
+Timeout::Timeout(int msec, Type t)
 	: type(t), timeout(msec), timeout_id(-1),
 	  callback_(0), data_(0) {}
 
diff --git a/src/insets/ExternalTemplate.C b/src/insets/ExternalTemplate.C
index 7a4391a817..3251d0e99b 100644
--- a/src/insets/ExternalTemplate.C
+++ b/src/insets/ExternalTemplate.C
@@ -24,6 +24,7 @@
 
 using std::endl;
 using std::ostream;
+using std::for_each;
 
 extern string user_lyxdir;
 
diff --git a/src/lyx_main.h b/src/lyx_main.h
index b37acb2dbc..c992dfc80a 100644
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -66,8 +66,8 @@ private:
 	bool first_start;
 	///
 	string batch_command;
-	///
-	struct sigaction act_;
+	/// 
+	// struct sigaction act_; // seems to be unused
 	//@}
 	/**@name Private Members */
 	//@{