diff --git a/src/Makefile.am b/src/Makefile.am
index 7b62c586f4..3513d3b0db 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ MAINTAINERCLEANFILES += $(srcdir)/config.h.in
 
 AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES)
 
-SUBDIRS = support frontends .
+SUBDIRS = support frontends tex2lyx client .
 
 EXTRA_DIST = config.h.in \
 	Section.h \
@@ -209,6 +209,7 @@ HEADERFILESCORE = \
 	FontIterator.h \
 	FontList.h \
 	Format.h \
+	FuncCode.h \
 	FuncRequest.h \
 	FuncStatus.h \
 	Graph.h \
@@ -225,7 +226,6 @@ HEADERFILESCORE = \
 	LayoutFile.h \
 	Length.h \
 	Lexer.h \
-	lfuns.h \
 	LyXAction.h \
 	lyxfind.h \
 	LyXFunc.h \
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 12a908472d..91beb72e2a 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -39,13 +39,13 @@ HEADERFILES = \
 
 if MONOLITHIC_CLIENT
 
-lyxclient.cpp:
+client.cpp:
 	@echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@
 
 AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
-BUILT_SOURCES = lyxclient.cpp
+BUILT_SOURCES = client.cpp
  
-lyxclient_SOURCES = lyxclient.cpp $(HEADERFILES)
+lyxclient_SOURCES = client.cpp $(HEADERFILES)
 
 else
 
diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 6b26436c41..38d3f9329a 100644
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -33,7 +33,7 @@ LINKED_FILES = \
 	../Floating.cpp \
 	../Counters.cpp \
 	../insets/InsetLayout.cpp \
-	../BaseClassList.h \
+	../LayoutFile.h \
 	../Layout.h \
 	../Layout.cpp \
 	../TextClass.cpp \