8 files changed, 8 insertions, 76 deletions
diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src
index b786184fa2f3..a8962044b47d 100644
--- a/vcl/source/src/btntext.src
+++ b/vcl/source/src/btntext.src
@@ -27,9 +27,7 @@
 
 #define _SV_BTNTEXT_SRC
 
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
+#include <svids.hrc>
 
 String SV_BUTTONTEXT_OK
 {
diff --git a/vcl/source/src/helptext.src b/vcl/source/src/helptext.src
index a42a9531d9ee..f66683bfd5dc 100644
--- a/vcl/source/src/helptext.src
+++ b/vcl/source/src/helptext.src
@@ -27,9 +27,7 @@
 
 #define _SV_HELPTEXT_SRC
 
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
+#include <svids.hrc>
 
 String SV_HELPTEXT_CLOSE
 {
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index 000d7215d80d..987ee29277c7 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -27,9 +27,7 @@
 
 #define _SV_IMAGES_SRC
 
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
+#include <svids.hrc>
 
 // =======================================================================
 
diff --git a/vcl/source/src/makefile.mk b/vcl/source/src/makefile.mk
deleted file mode 100644
index 161d821573b9..000000000000
--- a/vcl/source/src/makefile.mk
+++ /dev/null
@@ -1,57 +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=vcl
-TARGET=svsrc
-RESTARGET=vcl
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES=			images.src			\
-                    menu.src			\
-                    stdtext.src 		\
-                    helptext.src		\
-                    units.src		    \
-                    btntext.src         \
-                    print.src           \
-                    throbber.src        \
-
-RESLIB1NAME=		$(RESTARGET)
-RESLIB1IMAGES= $(PRJ)$/source/src
-RESLIB1SRSFILES=	$(SRS)$/svsrc.srs
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/vcl/source/src/menu.src b/vcl/source/src/menu.src
index 1833093adfac..cead04b9f6ec 100644
--- a/vcl/source/src/menu.src
+++ b/vcl/source/src/menu.src
@@ -25,9 +25,8 @@
  *
  ************************************************************************/
 #define _SV_MENU_SRC
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
+
+#include <svids.hrc>
 
 String SV_RESID_STRING_NOSELECTIONPOSSIBLE
 {
diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src
index f41e65f4939f..82b0c00c2e15 100644
--- a/vcl/source/src/print.src
+++ b/vcl/source/src/print.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include "vcl/svids.hrc"
+#include "svids.hrc"
 
 ModalDialog SV_DLG_PRINT
 {
diff --git a/vcl/source/src/stdtext.src b/vcl/source/src/stdtext.src
index 1b95f7bb1d72..9fd1487ce522 100644
--- a/vcl/source/src/stdtext.src
+++ b/vcl/source/src/stdtext.src
@@ -27,9 +27,7 @@
 
 #define _SV_STDTEXT_SRC
 
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
+#include <svids.hrc>
 
 String SV_STDTEXT_SERVICENOTAVAILABLE
 {
diff --git a/vcl/source/src/units.src b/vcl/source/src/units.src
index 16b40b3f41a3..ea5f6ecad2ce 100644
--- a/vcl/source/src/units.src
+++ b/vcl/source/src/units.src
@@ -26,9 +26,7 @@
  ************************************************************************/
 #define _SV_UNITS_SRC
 
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
+#include <svids.hrc>
 
 StringArray SV_FUNIT_STRINGS
 {