6 files changed, 4 insertions, 66 deletions
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
index af38c444c0f2..c211413af925 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
@@ -31,7 +31,7 @@
 #include <svtools/svmedit.hxx>
 #include <svtools/xtextedt.hxx>
 #include <svtools/editsyntaxhighlighter.hxx>
-#include "../../inc/txtattr.hxx"
+#include <svtools/txtattr.hxx>
 
 
 MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle,
diff --git a/svtools/source/edit/makefile.mk b/svtools/source/edit/makefile.mk
deleted file mode 100644
index 8d4da553cb0d..000000000000
--- a/svtools/source/edit/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=edit
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   \
-            $(EXCEPTIONSFILES) \
-            $(SLO)$/textdata.obj	\
-            $(SLO)$/textundo.obj	\
-            $(SLO)$/txtattr.obj		\
-            $(SLO)$/xtextedt.obj	\
-            $(SLO)$/sychconv.obj	\
-            $(SLO)$/svmedit.obj		\
-            $(SLO)$/svmedit2.obj    \
-        $(SLO)$/editsyntaxhighlighter.obj
-
-EXCEPTIONSFILES=	\
-            $(SLO)$/textview.obj	\
-            $(SLO)$/textdoc.obj     \
-            $(SLO)$/texteng.obj     \
-            $(SLO)$/textwindowpeer.obj \
-            $(SLO)$/syntaxhighlight.obj \
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/svtools/source/edit/sychconv.cxx b/svtools/source/edit/sychconv.cxx
index 3efa510bfc5a..d72200ac9c42 100644
--- a/svtools/source/edit/sychconv.cxx
+++ b/svtools/source/edit/sychconv.cxx
@@ -27,7 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-#include "sychconv.hxx"
+#include <svtools/sychconv.hxx>
 #include <vcl/outdev.hxx>
 
 BOOL SymCharConverter::Convert( Font& rFont, UniString& rString, OutputDevice* pDev )
diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx
index d4470904077e..1f7fa9745c8c 100644
--- a/svtools/source/edit/textdoc.cxx
+++ b/svtools/source/edit/textdoc.cxx
@@ -27,7 +27,6 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
-
 #include <textdoc.hxx>
 
 #include <stdlib.h>
diff --git a/svtools/source/edit/textdoc.hxx b/svtools/source/edit/textdoc.hxx
index 0c875b4fe07f..258f821beb19 100644
--- a/svtools/source/edit/textdoc.hxx
+++ b/svtools/source/edit/textdoc.hxx
@@ -30,7 +30,7 @@
 
 #include <svl/svarray.hxx>
 #include <svtools/textdata.hxx>
-#include <txtattr.hxx>
+#include <svtools/txtattr.hxx>
 
 #include <tools/debug.hxx>
 #include <tools/string.hxx>
diff --git a/svtools/source/edit/txtattr.cxx b/svtools/source/edit/txtattr.cxx
index e7466cbe1d85..810132731712 100644
--- a/svtools/source/edit/txtattr.cxx
+++ b/svtools/source/edit/txtattr.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#include <txtattr.hxx>
+#include <svtools/txtattr.hxx>
 #include <vcl/font.hxx>