6 files changed, 2 insertions, 33 deletions
diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c
index 951b59fb9c..4cc81bc977 100644
--- a/ext/mbstring/mb_gpc.c
+++ b/ext/mbstring/mb_gpc.c
@@ -37,8 +37,6 @@
 #include "mb_gpc.h"
 /* }}} */
 
-#ifdef HAVE_MBSTRING
-
 ZEND_EXTERN_MODULE_GLOBALS(mbstring)
 
 /* {{{ MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data)
@@ -373,5 +371,3 @@ SAPI_POST_HANDLER_FUNC(php_mb_post_handler)
 	}
 }
 /* }}} */
-
-#endif /* HAVE_MBSTRING */
diff --git a/ext/mbstring/mb_gpc.h b/ext/mbstring/mb_gpc.h
index 9ee258e941..397f70fd05 100644
--- a/ext/mbstring/mb_gpc.h
+++ b/ext/mbstring/mb_gpc.h
@@ -19,7 +19,6 @@
 #include "php.h"
 /* }}} */
 
-#ifdef HAVE_MBSTRING
 /* {{{ typedefs */
 typedef struct _php_mb_encoding_handler_info_t {
 	const char *separator;
@@ -41,4 +40,3 @@ MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data);
 int _php_mb_enable_encoding_translation(int flag);
 const mbfl_encoding *_php_mb_encoding_handler_ex(const php_mb_encoding_handler_info_t *info, zval *arg, char *res);
 /* }}} */
-#endif /* HAVE_MBSTRING */
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 6d19d25156..c400a2f5ee 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -74,8 +74,6 @@ onig_match(re, str, end, at, region, option)
 #include "mbstring_arginfo.h"
 /* }}} */
 
-#ifdef HAVE_MBSTRING
-
 /* {{{ prototypes */
 ZEND_DECLARE_MODULE_GLOBALS(mbstring)
 
@@ -4532,5 +4530,3 @@ static void php_mb_gpc_set_input_encoding(const zend_encoding *encoding) /* {{{
 	MBSTRG(http_input_identify) = (const mbfl_encoding*)encoding;
 }
 /* }}} */
-
-#endif	/* HAVE_MBSTRING */
diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index af15a30f75..561efeb422 100644
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -39,15 +39,13 @@
 #	define MBSTRING_API /* nothing special */
 #endif
 
-#ifdef HAVE_MBSTRING
-
 #include "libmbfl/mbfl/mbfilter.h"
 #include "SAPI.h"
 
 #define PHP_MBSTRING_API 20021024
 
 extern zend_module_entry mbstring_module_entry;
-#define mbstring_module_ptr &mbstring_module_entry
+#define phpext_mbstring_ptr &mbstring_module_entry
 
 PHP_MINIT_FUNCTION(mbstring);
 PHP_MSHUTDOWN_FUNCTION(mbstring);
@@ -123,12 +121,4 @@ ZEND_END_MODULE_GLOBALS(mbstring)
 ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
-#else	/* HAVE_MBSTRING */
-
-#define mbstring_module_ptr NULL
-
-#endif	/* HAVE_MBSTRING */
-
-#define phpext_mbstring_ptr mbstring_module_ptr
-
-#endif		/* _MBSTRING_H */
+#endif /* _MBSTRING_H */
diff --git a/ext/mbstring/php_unicode.c b/ext/mbstring/php_unicode.c
index c96d9b7180..d0cf9f55e5 100644
--- a/ext/mbstring/php_unicode.c
+++ b/ext/mbstring/php_unicode.c
@@ -30,8 +30,6 @@
 
 #include "php.h"
 
-#ifdef HAVE_MBSTRING
-
 /* include case folding data generated from the official UnicodeData.txt file */
 #include "mbstring.h"
 #include "php_unicode.h"
@@ -440,6 +438,3 @@ MBSTRING_API char *php_unicode_convert_case(
 	*ret_len = result.len;
 	return (char *) result.val;
 }
-
-
-#endif /* HAVE_MBSTRING */
diff --git a/ext/mbstring/php_unicode.h b/ext/mbstring/php_unicode.h
index 26d0979ca4..445f6f3a8d 100644
--- a/ext/mbstring/php_unicode.h
+++ b/ext/mbstring/php_unicode.h
@@ -31,8 +31,6 @@
 #ifndef PHP_UNICODE_H
 #define PHP_UNICODE_H
 
-#ifdef HAVE_MBSTRING
-
 #define UC_MN  0 /* Mark, Non-Spacing          */
 #define UC_MC  1 /* Mark, Spacing Combining    */
 #define UC_ME  2 /* Mark, Enclosing            */
@@ -190,8 +188,4 @@ static inline int php_unicode_is_upper(unsigned long code) {
 #define php_unicode_is_cased(cc) php_unicode_is_prop1(cc, UC_CASED)
 #define php_unicode_is_case_ignorable(cc) php_unicode_is_prop1(cc, UC_CASE_IGNORABLE)
 
-
-#endif
-
-
 #endif /* PHP_UNICODE_H */