diff --git a/Makefile b/Makefile
index 0b381dbdbd..6db72a5e62 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@ ASTCFLAGS=
 GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
 USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
 
-MOD_SUBDIR_CFLAGS=-I../include -I../main
+MOD_SUBDIR_CFLAGS=-I../include
 OTHER_SUBDIR_CFLAGS=-I../include
 
 ifeq ($(OSARCH),linux-gnu)
diff --git a/channels/h323/Makefile b/channels/h323/Makefile
index df309e6f62..eea355ebd6 100644
--- a/channels/h323/Makefile
+++ b/channels/h323/Makefile
@@ -6,7 +6,7 @@
 
 .PHONY: Makefile.ast clean
 
-default::	opt
+default::	
 
 # Verify those options with main Makefile
 STDCCFLAGS	= -DNDEBUG
@@ -21,7 +21,7 @@ OBJDIR		= .
 OBJS		=
 
 ifndef OPENH323DIR
-OPENH323DIR=/usr/src/OpenH323/openh323
+OPENH323DIR=
 endif
 
 include $(OPENH323DIR)/openh323u.mak
diff --git a/main/jitterbuf.h b/include/jitterbuf.h
similarity index 100%
rename from main/jitterbuf.h
rename to include/jitterbuf.h