diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 6125822dcb..40935acbc6 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -102,6 +102,8 @@ extern "C" {
 }
 #endif
 
+#undef open
+#undef close
 #include "h323/chan_h323.h"
 
 receive_digit_cb on_receive_digit;
diff --git a/channels/h323/ast_h323.cxx b/channels/h323/ast_h323.cxx
index 6c8b39d55f..bec0c4ab84 100644
--- a/channels/h323/ast_h323.cxx
+++ b/channels/h323/ast_h323.cxx
@@ -25,7 +25,6 @@
  *
  * Version Info: $Id$
  */
-#include "asterisk.h"
 #define VERSION(a,b,c) ((a)*10000+(b)*100+(c))
 
 
@@ -70,6 +69,8 @@
 
 #include "compat_h323.h"
 
+#include "asterisk.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -80,6 +81,9 @@ extern "C" {
 }
 #endif
 
+#undef open
+#undef close
+
 #include "chan_h323.h"
 #include "ast_h323.h"
 #include "cisco-h225.h"