diff --git a/Source/Preprocessor/Makefile.in b/Source/Preprocessor/Makefile.in
index 830ef6c72..66601e599 100644
--- a/Source/Preprocessor/Makefile.in
+++ b/Source/Preprocessor/Makefile.in
@@ -9,7 +9,7 @@ RPATH       = @RPATH@
 SO          = @SO@
 CCSHARED    = @CCSHARED@
 LDSHARED    = @LDSHARED@
-INCLUDE     = -I. -I../Core -I../DOH/Include
+INCLUDE     = -I. -I../Swig -I../DOH/Include
 
 SRCS = expr.c cpp.c
 OBJS = expr.o cpp.o
diff --git a/Source/SWIG1.1/Makefile.in b/Source/SWIG1.1/Makefile.in
index 75ff53baa..000c6b4e6 100644
--- a/Source/SWIG1.1/Makefile.in
+++ b/Source/SWIG1.1/Makefile.in
@@ -48,7 +48,7 @@ LIBSRCS = main.cxx scanner.cxx symbol.cxx include.cxx types.cxx parms.cxx emit.c
           sstring.cxx wrapfunc.cxx comment.cxx typemap.cxx naming.cxx
 
 PARSER   = parser.y
-INCLUDE  = -I../Include -I. -I../Core -I../Preprocessor -I../DOH/Include
+INCLUDE  = -I../Include -I. -I../Swig -I../Preprocessor -I../DOH/Include
 CFLAGS   = @CFLAGS@ -DSWIG_LIB='"$(SWIG_LIB)"' -DSWIG_CC='"$(CC)"' @DEFS@
 SHELL  = /bin/sh
 
diff --git a/configure.in b/configure.in
index e146077fb..3c53b76e2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(Source/Core/swigcore.h)
+AC_INIT(Source/Swig/swigcore.h)
 AC_PREREQ(2.0)
 
 # Set name for machine-dependent library files
@@ -452,6 +452,6 @@ AC_SUBST(PERL5EXT)
 
 # Note we write DOH's Makefiles for it -- if it has any special configure
 # stuff, we're going to skip it!
-AC_OUTPUT(Makefile Source/Core/Makefile Source/DOH/Doh/Makefile 
+AC_OUTPUT(Makefile Source/Swig/Makefile Source/DOH/Doh/Makefile 
     Source/DOH/Makefile Source/Preprocessor/Makefile Source/SWIG1.1/Makefile
     Source/Modules1.1/Makefile Examples/Makefile)