Fix ICU compliation when not using 51.x

'brew update' to a newer icu4c on OS X exposed that we aren't
being consistent in how we include it resulting in linker errors due to
confusion regarding what the icu namespace is.

Reviewed By: @sgolemon

Differential Revision: D1019529

hphp/runtime/ext/icu/ICUMatcher.h

@@ -18,13 +18,14 @@
 #define incl_HPHP_ICU_MATCHER_H_
 
 #include <boost/scoped_ptr.hpp>
-#include <unicode/regex.h>
 
 // Avoid dragging in the icu namespace.
 #ifndef U_USING_ICU_NAMESPACE
 #define U_USING_ICU_NAMESPACE 0
 #endif
 
+#include <unicode/regex.h>
+
 namespace HPHP {
 // Wrapper class around icu::RegexMatcher that provides a default constructor
 // so that it can be used in thread-local storage.

hphp/runtime/ext/icu/ICUTransliterator.h

@@ -18,13 +18,14 @@
 #define incl_HPHP_ICU_TRANSLITERATOR_H_
 
 #include <boost/scoped_ptr.hpp>
-#include <unicode/translit.h>
 
 // Avoid dragging in the icu namespace.
 #ifndef U_USING_ICU_NAMESPACE
 #define U_USING_ICU_NAMESPACE 0
 #endif
 
+#include <unicode/translit.h>
+
 namespace HPHP {
 // Wrapper class around icu::Transliterator that provides a default constructor
 // so that it can be used in thread-local storage.

hphp/runtime/ext/icu/LifeEventTokenizer.h

@@ -22,13 +22,13 @@
 #include <vector>
 #include <boost/scoped_ptr.hpp>
 
-#include <unicode/rbbi.h> // icu
-
 // Avoid dragging in the icu namespace.
 #ifndef U_USING_ICU_NAMESPACE
 #define U_USING_ICU_NAMESPACE 0
 #endif
 
+#include <unicode/rbbi.h> // icu
+
 namespace HPHP {
 
 typedef icu::RuleBasedBreakIterator BreakIterator;

hphp/zend/zend-html.h

@@ -20,6 +20,11 @@
 
 #include "hphp/util/base.h"
 
+// Avoid dragging in the icu namespace.
+#ifndef U_USING_ICU_NAMESPACE
+#define U_USING_ICU_NAMESPACE 0
+#endif
+
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 /**