diff --git a/gnoemoe/Makefile.am b/gnoemoe/Makefile.am
index c7ad4fa..5e0d259 100644
--- a/gnoemoe/Makefile.am
+++ b/gnoemoe/Makefile.am
@@ -3,6 +3,7 @@
 SUBDIRS = parser
 CLEANFILES =
 INCLUDES = \
+	-I$(srcdir) \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	@PACKAGE_CFLAGS@ \
@@ -11,7 +12,15 @@ INCLUDES = \
 bin_PROGRAMS = gnoemoe
 BUILT_SOURCES = gm-marshal.c gm-marshal.h
 
-gnoemoe_SOURCES = $(BUILT_SOURCES) \
+gnoemoe_SOURCES =
+
+include widgets/Makefile.include
+include dialogs/Makefile.include
+include mcp/Makefile.include
+include mcp/Makefile.classes
+
+gnoemoe_SOURCES += $(BUILT_SOURCES) \
+		gm-ansi.h gm-ui.h \
 		gm-app.c gm-app.h  \
 		gm-options.c gm-options.h \
 		gm-color-table.c gm-color-table.h \
@@ -25,10 +34,11 @@ gnoemoe_SOURCES = $(BUILT_SOURCES) \
 		gm-debug.c gm-debug.h \
 		list.c list.h
 
-include $(srcdir)/widgets/Makefile.include
-include $(srcdir)/dialogs/Makefile.include
-include $(srcdir)/mcp/Makefile.include
-include $(srcdir)/mcp/Makefile.classes
+EXTRA_DIST = gm-marshal.list \
+	widgets/Makefile.include \
+	dialogs/Makefile.include \
+	mcp/Makefile.include \
+	mcp/Makefile.classes
 
 if HAVE_SCRIPT
 gnoemoe_SOURCES += gm-scripts.c gm-scripts.h