Remove some more include guards

Change-Id: I7c62d086cb593744785abecae7a107686a4d65ce

7 files changed, 1 insertions, 23 deletions

diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 339f265bf0c2..893ec73b841e 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -33,10 +33,7 @@
 #include <SwGetPoolIdFromName.hxx>
 #include "swdllapi.h"
 
-#ifndef INCLUDED_HASH_MAP
 #include <boost/unordered_map.hpp>
-#define INCLUDED_HASH_MAP
-#endif
 #include <stringhash.hxx>
 
 #include <boost/ptr_container/ptr_vector.hpp>
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 4377364c5736..fe4a353aff9d 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -41,10 +41,7 @@
 
 #include <svtools/embedhlp.hxx>
 
-#ifndef INCLUDED_VECTOR
 #include <vector>
-#define INCLUDED_VECTOR
-#endif
 
 namespace editeng { class SvxBorderLine; }
 
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 7b47fcda7559..d5849c7f2a8e 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -30,11 +30,7 @@
 #include <tools/solar.h>
 #include <SwGetPoolIdFromName.hxx>
 
-#ifndef INCLUDED_LIMITS_H
 #include <limits.h>     //For LONG_MAX.
-#define INCLUDED_LIMITS_H
-#endif
-
 #include <com/sun/star/uno/Reference.h>
 #include "swdllapi.h"
 #include <i18npool/lang.h>
diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx
index d9c3219b4481..6b896a6f2e3f 100644
--- a/sw/inc/tabcol.hxx
+++ b/sw/inc/tabcol.hxx
@@ -30,10 +30,7 @@
 
 #include <tools/solar.h>
 
-#ifndef INCLUDED_VECTOR
 #include <vector>
-#define INCLUDED_VECTOR
-#endif
 #include "swdllapi.h"
 
 struct SwTabColsEntry
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 229d9d3ec61a..f8217350230a 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -42,11 +42,7 @@
 #include <toxe.hxx>
 #include <calbck.hxx>
 
-#ifndef INCLUDED_VECTOR
 #include <vector> // #i21237#
-#define INCLUDED_VECTOR
-#endif
-
 
 namespace com { namespace sun { namespace star {
     namespace text { class XDocumentIndexMark; }
diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
index 84c6cae939dc..1947e8740e48 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -29,10 +29,7 @@
 
 #include <flddropdown.hxx>
 
-#ifndef INCLUDED_ALGORITHM
 #include <algorithm>
-#define INCLUDED_ALGORITHM
-#endif
 #include <svl/poolitem.hxx>
 
 #include <unofldmid.h>
diff --git a/sw/source/ui/uno/unofreg.cxx b/sw/source/ui/uno/unofreg.cxx
index a20be9de8dcd..ef7a1cef435e 100644
--- a/sw/source/ui/uno/unofreg.cxx
+++ b/sw/source/ui/uno/unofreg.cxx
@@ -32,10 +32,8 @@
 #include <uno/lbnames.h>
 #include <cppuhelper/factory.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
-#ifndef INCLUDED_STRING_H
+
 #include <string.h>
-#define INCLUDED_STRING_H
-#endif
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;