diff --git a/src/Makefile b/src/Makefile
index fb62194aa3..763611264a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -27,8 +27,9 @@
 srcdir   = .
 
 CC       = gcc
-INCLPATH = -I.. -I./engine -I./register -I./../include
-CFLAGS   =  -O2 -Wall -g -Wall ${INCLPATH}
+INCLPATH = -I.. -I./engine -I./register -I./../include -I/usr/local/include
+CFLAGS   =  -O2 -Wall -g -Wall  -I/usr/X11R6/include ${INCLPATH}
+
 
 ######################################################################
 # See Makefile.common for information about these variables.
diff --git a/src/gnome/Makefile b/src/gnome/Makefile
index 8afa322cac..b668253fff 100644
--- a/src/gnome/Makefile
+++ b/src/gnome/Makefile
@@ -25,15 +25,22 @@
 
 # These three lines are suggested defs for autoconf (see the info pages).
 
+prefix   = /usr/local
 srcdir   = .
+includedir=${prefix}/include
+
 
 CC       = gcc
-INCLPATH = -I.. -I../.. -I../engine -I../register -I./../../include
+INCLPATH = -I.. -I../.. -I../engine -I../register -I./../../include \
+           -I$(includedir) -I$(prefix)/lib/gnome-libs/include
+ 
 
 CFLAGS   =  -O2 -Wall -g -Wall  -I/usr/X11R6/include ${INCLPATH}
 LDFLAGS  =  -g -Wall
-LIBS     = -lpng -ljpeg -lz -lm  -lSM -lICE -lXpm  -L/usr/X11R6/lib $(shell gtk-config --libs) \
-            -lgnomeui -lgnome -lgnomesupport -lgdk_imlib -ltiff -ldl
+LIBS     = -L$(prefix)/lib -lpng -ljpeg -lz -lm  -lSM -lICE -lXpm  -L/usr/X11R6/lib \
+           $(shell gtk-config --libs)  -lgnomeui -lgnome \
+           -lgnomesupport -lintl -lgdk_imlib -ltiff
+
 
 TARGET   = ../../xacc.gtk.bin
 STATIC   = ../../xacc-static.gtk.bin
@@ -42,7 +49,8 @@ OTHER_OBJS := ../obj/gnome/*.o ../engine/obj/*.o ../register/obj/gnome/*.o
 
 ######################################################################
 # See Makefile.common for information about these variables.
-GNOME_SRCS := main.c MainWindow.c MenuBar.c RegWindow.c Dialogs.c
+GNOME_SRCS := main.c MainWindow.c MenuBar.c RegWindow.c Add_Dialog.c xtutil.c \
+              RecnWindow.c
 #        AccWindow.c AccountMenu.c AdjBWindow.c    \
 #        BuildMenu.c Destroy.c FileBox.c HelpWindow.c  \
 #        RecnWindow.c RegWindow.c Reports.c TextBox.c  \
diff --git a/src/register/Makefile b/src/register/Makefile
index e9832e5be7..a2edfade1d 100644
--- a/src/register/Makefile
+++ b/src/register/Makefile
@@ -29,9 +29,11 @@ INCLPATH = -I./../.. \
            -I./../../include \
            -I./../engine \
            -I./../../lib/ComboBox-1.33 \
-           -I./../../lib/Xbae-4.6.2-linas 
+           -I./../../lib/Xbae-4.6.2-linas \
+           -I/usr/local/include
+ 
 
-CFLAGS :=  -O2 -Wall -g -Wall  -DCELL_WIDGETS=1 ${INCLPATH}
+CFLAGS :=  -O2 -Wall -g -Wall  -I/usr/X11R6/include -DCELL_WIDGETS=1 ${INCLPATH} 
 
 ######################################################################
 # See Makefile.common for information about these variables.