From 7fe20800e0f9e07e76a731973ca143c8f96efe73 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Wed, 8 Aug 2007 10:50:34 +0200
Subject: [PATCH] mapi32: Remove redundant protections against duplicate header
 inclusion.

---
 include/mapidefs.h | 2 --
 include/mapix.h    | 8 --------
 2 files changed, 10 deletions(-)

diff --git a/include/mapidefs.h b/include/mapidefs.h
index 219177d62ee..b753045107c 100644
--- a/include/mapidefs.h
+++ b/include/mapidefs.h
@@ -24,9 +24,7 @@
 #endif
 
 #include <winerror.h>
-#ifndef _OBJBASE_H_
 #include <objbase.h>
-#endif
 #include <stddef.h>
 
 /* Some types from other headers */
diff --git a/include/mapix.h b/include/mapix.h
index e511cdf3b92..1ca7aaf9a5a 100644
--- a/include/mapix.h
+++ b/include/mapix.h
@@ -19,18 +19,10 @@
 #ifndef MAPIX_H
 #define MAPIX_H
 
-#ifndef MAPIDEFS_H
 #include <mapidefs.h>
-#endif
-#ifndef MAPICODE_H
 #include <mapicode.h>
-#endif
-#ifndef MAPIGUID_H
 #include <mapiguid.h>
-#endif
-#ifndef MAPITAGS_H
 #include <mapitags.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {