diff --git a/src/Layout.cpp b/src/Layout.cpp
index 6861b5b2b2..0faa29e847 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -874,6 +874,7 @@ docstring const i18npreamble(Language const * lang, Encoding const & enc,
 #ifdef TEX2LYX
 	// tex2lyx does not have getMessages()
 	LASSERT(false, /**/);
+	(void)enc;
 #else
 	string const langenc = lang->encoding()->iconvName();
 	string const texenc = lang->encoding()->latexName();
diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 12b7bda117..10075dcf4a 100644
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -244,7 +244,7 @@ completer_(new GuiCompleter(p, p))
 }
 
 
-GuiWorkArea::GuiWorkArea(QWidget * w)
+GuiWorkArea::GuiWorkArea(QWidget * /* w */)
 : d(new Private(this)) 
 {
 }
diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 73c37eaa66..5473e393f1 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -167,7 +167,7 @@ NOMOCHEADER = \
 	GuiImage.h \
 	GuiKeySymbol.h \
 	GuiPainter.h \
-	GuiWorkArea_Private.cpp \
+	GuiWorkArea_Private.h \
 	LaTeXHighlighter.h \
 	qt_i18n.h \
 	qt_helpers.h \