From ba0e59d6146e38b2be36e89383f334bff403dcc4 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 19 Jul 2000 12:30:49 +0000
Subject: [PATCH] Small cleanup from Angus

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@900 a592a061-630c-0410-9148-cb99ea01b6c8
---
 ChangeLog                 | 6 ++++++
 src/ToolbarDefaults.C     | 1 +
 src/commandtags.h         | 2 +-
 src/insets/insettabular.C | 1 +
 src/insets/insettoc.C     | 1 +
 src/insets/inseturl.C     | 1 +
 src/mathed/math_panel.C   | 6 ++++++
 7 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 43bd61b642..76487df190 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-19  Angus Leeming  <a.leeming@ic.ac.uk>
+
+	* src/commandtags.h: do not include "debug.h" which does not
+	belong there. #include it in some other places because of this
+	change. 
+
 2000-07-19  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* src/insets/insetcaption.C: add a couple "using" directives.
diff --git a/src/ToolbarDefaults.C b/src/ToolbarDefaults.C
index ee902e53d0..33674b6f1b 100644
--- a/src/ToolbarDefaults.C
+++ b/src/ToolbarDefaults.C
@@ -3,6 +3,7 @@
 #include "ToolbarDefaults.h"
 #include "LyXAction.h"
 #include "toolbar.h"
+#include "debug.h"
 
 using std::endl;
 
diff --git a/src/commandtags.h b/src/commandtags.h
index 0be43d8e75..595ebd6ad1 100644
--- a/src/commandtags.h
+++ b/src/commandtags.h
@@ -10,7 +10,7 @@
 #ifndef COMMANDTAGS_H
 #define COMMANDTAGS_H
 
-#include "debug.h"
+#include <iosfwd>
 
 /** These are all the lyxfunctions (as enums).
  */
diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 9916a5fa5c..31ca6ec42f 100644
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -23,6 +23,7 @@
 
 #include "buffer.h"
 #include "commandtags.h"
+#include "debug.h"
 #include "LaTeXFeatures.h"
 #include "Painter.h"
 #include "font.h"
diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C
index a30456235d..1c633ff0a7 100644
--- a/src/insets/insettoc.C
+++ b/src/insets/insettoc.C
@@ -7,6 +7,7 @@
 #include "gettext.h"
 #include "insettoc.h"
 #include "commandtags.h"
+#include "debug.h"
 #include "lyxfunc.h"
 #include "LyXView.h"
 #include "BufferView.h"
diff --git a/src/insets/inseturl.C b/src/insets/inseturl.C
index 240dc34609..bb188b9075 100644
--- a/src/insets/inseturl.C
+++ b/src/insets/inseturl.C
@@ -10,6 +10,7 @@
 #include "inseturl.h"
 #include "LString.h"
 #include "commandtags.h"
+#include "debug.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "lyx_gui_misc.h" // CancelCloseBoxCB
diff --git a/src/mathed/math_panel.C b/src/mathed/math_panel.C
index 6c10630a86..76da97e48d 100644
--- a/src/mathed/math_panel.C
+++ b/src/mathed/math_panel.C
@@ -14,6 +14,12 @@
 
 #include <config.h>
 
+#ifdef HAVE_SSTREAM
+#include <sstream>
+#else
+#include <strstream>
+#endif
+
 #include FORMS_H_LOCATION
 
 #include "lyx_gui_misc.h" 
-- 
2.39.2