Merged the ICE branch into the trunk
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@992 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjlib-util/include/pjlib-util.h b/pjlib-util/include/pjlib-util.h
index 38f4ea1..0f7848a 100644
--- a/pjlib-util/include/pjlib-util.h
+++ b/pjlib-util/include/pjlib-util.h
@@ -30,9 +30,16 @@
#include <pjlib-util/md5.h>
#include <pjlib-util/resolver.h>
#include <pjlib-util/scanner.h>
-#include <pjlib-util/stun.h>
#include <pjlib-util/xml.h>
+/* New STUN */
+#include <pjlib-util/stun_endpoint.h>
+#include <pjlib-util/stun_msg.h>
+#include <pjlib-util/stun_server.h>
+#include <pjlib-util/stun_transaction.h>
+
+/* Old STUN */
+#include <pjlib-util/stun_simple.h>
/**
* @addtogroup PJLIB_UTIL