*/
#include <config.h>
-#include "debug.h"
+#include "support/debug.h"
#include "InsetFoot.h"
#include "Buffer.h"
#include "BufferParams.h"
#include "Counters.h"
-#include "gettext.h"
+#include "support/gettext.h"
#include "Layout.h"
// FIXME: the following is needed just to get the layout of the enclosing
// paragraph. This seems a bit too much to me (JMarc)
#include "OutputParams.h"
#include "ParIterator.h"
+#include "TextClass.h"
-#include "support/std_ostream.h"
#include "support/lstrings.h"
-namespace lyx {
+#include <ostream>
+
+using namespace std;
-using std::string;
-using std::auto_ptr;
-using std::ostream;
+namespace lyx {
InsetFoot::InsetFoot(BufferParams const & bp)