--- openh323u.mak.in.orig	2004-03-05 21:21:37.804902816 +0100
+++ openh323u.mak.in	2004-03-05 21:25:43.476555048 +0100
@@ -139,7 +139,6 @@
 
 PWLIBDIR	= @PWLIBDIR@
 OPENH323DIR	= @OPENH323DIR@
-STDCCFLAGS	+= @STDCCFLAGS@
 LDFLAGS		+= @LDFLAGS@
 ENDLDLIBS	:= @ENDLDLIBS@ $(ENDLDLIBS)
 
@@ -160,6 +159,13 @@
 
 #OH323_SUPPRESS_H235	= 1
 
+#
+# stkn@gentoo.org
+# oops i did it again :)
+# moved STDCCFLAGS a little bit around
+# this fixes include order problems
+# (use build dir includes before system includes...)
+#
 OH323_SRCDIR = $(OPENH323DIR)/src
 ifdef PREFIX
 OH323_INCDIR = $(PREFIX)/include/openh323
@@ -168,6 +174,8 @@
 endif
 OH323_LIBDIR = $(OPENH323DIR)/lib
 
+STDCCFLAGS	+= -I$(OH323_INCDIR) @STDCCFLAGS@
+
 ifdef NOTRACE
 STDCCFLAGS += -DPASN_NOPRINTON -DPASN_LEANANDMEAN
 OH323_SUFFIX = n
@@ -191,8 +199,6 @@
 LDFLAGS	    += -L$(OH323_LIBDIR)
 LDLIBS	    := -l$(OH323_BASE) $(LDLIBS)
 
-STDCCFLAGS  += -I$(OH323_INCDIR)
-
 #ifndef NO_SPEEX
 ifeq ($(H323_SYSTEM_SPEEX),1)
 ENDLDLIBS    := -lspeex $(ENDLDLIBS)