diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am
index 4a6124144..50e66e661 100644
--- a/desmume/src/Makefile.am
+++ b/desmume/src/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/src/desmume.mk
 
-AM_CPPFLAGS += $(SDL_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(X_CFLAGS) $(LUA_CFLAGS)
+AM_CPPFLAGS += $(SDL_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(X_CFLAGS) $(LUA_CFLAGS) $(ALSA_CFLAGS)
 
 EXTRA_DIST = build.bat instruction_tabdef.inc thumb_tabdef.inc fs-linux.cpp fs-windows.cpp \
 	matrix_sse2-x64.asm matrix_sse2-x86.asm
diff --git a/desmume/src/cli/Makefile.am b/desmume/src/cli/Makefile.am
index 7029ff119..ff83f9119 100644
--- a/desmume/src/cli/Makefile.am
+++ b/desmume/src/cli/Makefile.am
@@ -1,11 +1,11 @@
 SUBDIRS = doc
 include $(top_srcdir)/src/desmume.mk
 
-AM_CFLAGS += $(SDL_CFLAGS)
+AM_CFLAGS += $(SDL_CFLAGS) $(ALSA_CFLAGS)
 
 bin_PROGRAMS = desmume-cli
 desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp
-desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS)
+desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS)
 if HAVE_GDB_STUB
 desmume_cli_LDADD += ../gdbstub/libgdbstub.a
 endif
diff --git a/desmume/src/gtk-glade/Makefile.am b/desmume/src/gtk-glade/Makefile.am
index 877fa7f5b..41a09f631 100644
--- a/desmume/src/gtk-glade/Makefile.am
+++ b/desmume/src/gtk-glade/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = doc
 include $(top_srcdir)/src/desmume.mk
 
 AM_CPPFLAGS += $(SDL_CFLAGS) $(GTKGLEXT_CFLAGS) $(LIBGLADE_CFLAGS) \
-		$(GTHREAD_CFLAGS) -DDATADIR=\"$(gladedir)/\" \
+		$(GTHREAD_CFLAGS) $(ALSA_CFLAGS) -DDATADIR=\"$(gladedir)/\" \
 		-DLOCALEDIR=\"$(localedir)\"
 AM_LDFLAGS += -rdynamic $(INTLLIBS)
 
@@ -30,7 +30,7 @@ desmume_glade_SOURCES =  \
 
 desmume_glade_LDADD = ../libdesmume.a \
 			$(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \
-			$(GTHREAD_LIBS)
+			$(GTHREAD_LIBS) $(ALSA_LIBS)
 if HAVE_GDB_STUB
 desmume_glade_LDADD += ../gdbstub/libgdbstub.a
 endif
diff --git a/desmume/src/gtk/Makefile.am b/desmume/src/gtk/Makefile.am
index 57ffdceb4..a233bf213 100644
--- a/desmume/src/gtk/Makefile.am
+++ b/desmume/src/gtk/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = doc
 include $(top_srcdir)/src/desmume.mk
 
-AM_CPPFLAGS += $(SDL_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS)
+AM_CPPFLAGS += $(SDL_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(ALSA_CFLAGS)
 
 Applicationsdir = $(datadir)/applications
 Applications_DATA = desmume.desktop
@@ -12,7 +12,7 @@ bin_PROGRAMS = desmume
 desmume_SOURCES = \
 	desmume.h desmume.cpp \
 	dTool.h dToolsList.cpp \
-	tools/ioregsView.cpp tools/ioregsView.h \
+	tools/ioregsView.cpp tools/ioregsView.h tools/memoryView.cpp \
 	../sndsdl.cpp \
 	../ctrlssdl.h ../ctrlssdl.cpp \
 	osmesa_3Demu.cpp osmesa_3Demu.h \
@@ -20,7 +20,7 @@ desmume_SOURCES = \
 	cheatsGTK.h cheatsGTK.cpp \
 	main.cpp main.h
 desmume_LDADD = ../libdesmume.a \
-	$(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS)
+	$(SDL_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(ALSA_LIBS)
 if HAVE_GDB_STUB
 desmume_LDADD += ../gdbstub/libgdbstub.a
 endif