diff --git a/lib/layouts/AEA.layout b/lib/layouts/AEA.layout
index 7481abd9cf..2a122c2e48 100644
--- a/lib/layouts/AEA.layout
+++ b/lib/layouts/AEA.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[AEA]{American Economic Association (AEA)}
+#  \DeclareLaTeXClass[AEA,amsmath.sty,harvard.sty,multicol.sty,setspace.sty]{American Economic Association (AEA)}
 #  \DeclareCategory{Articles}
 # Authors : Koji Yokota <yokota@res.otaru-uc.ac.jp>
 #           Uwe Stöhr <uwestoehr@web.de>
diff --git a/lib/layouts/RJournal.layout b/lib/layouts/RJournal.layout
index f723d38e7b..d61e9d8000 100644
--- a/lib/layouts/RJournal.layout
+++ b/lib/layouts/RJournal.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[report]{R Journal}
+#  \DeclareLaTeXClass[report,RJournal.sty,booktabs.sty,natbib.sty]{R Journal}
 #  \DeclareCategory{Reports}
 # Author: Yihui Xie
 # Modified by: Scott Kostyshak
diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout
index 1d08b59c09..d8ddef4e39 100644
--- a/lib/layouts/aa.layout
+++ b/lib/layouts/aa.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[aa]{Astronomy & Astrophysics}
+#  \DeclareLaTeXClass[aa,answers.sty]{Astronomy & Astrophysics}
 #  \DeclareCategory{Articles}
 #
 # Author: Peter Sütterlin <pit@uni-sw.gwdg.de>
diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index 432d450bb4..694089a0f7 100644
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[aastex]{American Astronomical Society (AASTeX v. 5)}
+#  \DeclareLaTeXClass[aastex,amssymb.sty,latexsym.sty,natbib.sty,verbatim.sty]{American Astronomical Society (AASTeX v. 5)}
 #  \DeclareCategory{Articles}
 #
 # LyX support for the AAS TeX package http://www.ctan.org/pkg/aastex
diff --git a/lib/layouts/aastex6.layout b/lib/layouts/aastex6.layout
index 30bfbf6f74..95a8ee89b4 100644
--- a/lib/layouts/aastex6.layout
+++ b/lib/layouts/aastex6.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[aastex6]{American Astronomical Society (AASTeX v. 6)}
+#\DeclareLaTeXClass[aastex6,amssymb.sty,latexsym.sty,natbib.sty,verbatim.sty]{American Astronomical Society (AASTeX v. 6)}
 #  \DeclareCategory{Articles}
 #
 # LyX support for the AAS TeX package http://www.ctan.org/pkg/aastex
diff --git a/lib/layouts/achemso.layout b/lib/layouts/achemso.layout
index a2c7eeb88f..6dcb56e3c3 100644
--- a/lib/layouts/achemso.layout
+++ b/lib/layouts/achemso.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[achemso]{American Chemical Society (ACS)}
+#  \DeclareLaTeXClass[achemso,caption.sty,courier.sty,cleveref.sty,float.sty,helvet.sty,mathptmx.sty,mciteplus.sty,natbib.sty,natmove.sty,setspace.sty,xkeyval.sty]{American Chemical Society (ACS)}
 #  \DeclareCategory{Articles}
 # textclass definition file for achemso 3.8 and 3.9
 # Author: Uwe Stöhr (uwestoehr@web.de)
diff --git a/lib/layouts/acmsiggraph-0-92.layout b/lib/layouts/acmsiggraph-0-92.layout
index b43a984ab8..221c980c7e 100644
--- a/lib/layouts/acmsiggraph-0-92.layout
+++ b/lib/layouts/acmsiggraph-0-92.layout
@@ -1,5 +1,5 @@
 #% Do not delete he line below; configure depends on this
-#  \DeclareLaTeXClass[acmsiggraph]{ACM SIGGGRAPH 0.92 (obsolete)}
+#  \DeclareLaTeXClass[acmsiggraph,comment.sty,lineno.sty]{ACM SIGGGRAPH 0.92 (obsolete)}
 #  \DeclareCategory{Obsolete}
 # ACM SIGGRAPH textclass definition file.
 # Author : Uwe Stöhr
diff --git a/lib/layouts/acmsiggraph.layout b/lib/layouts/acmsiggraph.layout
index bae1e8882d..4332ec47ad 100644
--- a/lib/layouts/acmsiggraph.layout
+++ b/lib/layouts/acmsiggraph.layout
@@ -1,5 +1,5 @@
 #% Do not delete he line below; configure depends on this
-#  \DeclareLaTeXClass[acmsiggraph]{ACM SIGGRAPH (older than 0.91, obsolete)}
+#  \DeclareLaTeXClass[acmsiggraph,comment.sty,lineno.sty]{ACM SIGGRAPH (older than 0.91, obsolete)}
 #  \DeclareCategory{Obsolete}
 # ACM SIGGRAPH acmsiggraph textclass definition file.
 # Author : Uwe Stöhr
diff --git a/lib/layouts/agums.layout b/lib/layouts/agums.layout
index 5586b3638a..18d5953015 100644
--- a/lib/layouts/agums.layout
+++ b/lib/layouts/agums.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[aguplus]{American Geophysical Union (AGUPLUS Manuscript)}
+#  \DeclareLaTeXClass[aguplus,agums.sty]{American Geophysical Union (AGUPLUS Manuscript)}
 #  \DeclareCategory{Articles}
 # AGUplus manuscript textclass definition file.
 # Author: Martin Vermeer <martin.vermeer@hut.fi>
diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index 45e3935fc1..f631428d93 100644
--- a/lib/layouts/apa.layout
+++ b/lib/layouts/apa.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[apa]{American Psychological Association (APA)}
+#  \DeclareLaTeXClass[apa,apacite.sty,endfloat.sty,endnotes.sty,flushend.sty,txfonts.sty]{American Psychological Association (APA)}
 #  \DeclareCategory{Articles}
 # Author: Randy Gobbel <gobbel@andrew.cmu.edu>
 
diff --git a/lib/layouts/arab-article.layout b/lib/layouts/arab-article.layout
index 0795d55928..53c462f98d 100644
--- a/lib/layouts/arab-article.layout
+++ b/lib/layouts/arab-article.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[arabart]{Arabic Article}
+#  \DeclareLaTeXClass[arabart,arabrep,altxext.sty,arabext.sty,arabtex.sty]{Arabic Article}
 #  \DeclareCategory{Articles}
 # Arabic article textclass definition file.
 # Author: Dekel Tsur <dekel@math.tau.ac.il>
diff --git a/lib/layouts/article-beamer.layout b/lib/layouts/article-beamer.layout
index f5b6b54a4e..5d49a709d5 100644
--- a/lib/layouts/article-beamer.layout
+++ b/lib/layouts/article-beamer.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[article]{Beamer Article (Standard Class)}
+#  \DeclareLaTeXClass[article,beamerarticle.sty,keyval.sty,pgf.sty]{Beamer Article (Standard Class)}
 #  \DeclareCategory{Articles}
 # Author: Jürgen Spitzmüller <spitz@lyx.org>
 
diff --git a/lib/layouts/beamerposter.layout b/lib/layouts/beamerposter.layout
index d5ed0be3ed..814345a7a3 100644
--- a/lib/layouts/beamerposter.layout
+++ b/lib/layouts/beamerposter.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[beamer]{Beamerposter}
+#  \DeclareLaTeXClass[beamer,beamerposter.sty]{Beamerposter}
 #  \DeclareCategory{Posters}
 # Wrapper layout for the beamer class with beamerposter style
 #
diff --git a/lib/layouts/broadway.layout b/lib/layouts/broadway.layout
index 335f028bba..7993ffbb2d 100644
--- a/lib/layouts/broadway.layout
+++ b/lib/layouts/broadway.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[broadway]{Broadway}
+#  \DeclareLaTeXClass[broadway,extramarks.sty,fancyhdr.sty,lastpage.sty]{Broadway}
 #  \DeclareCategory{Scripts}
 
 # For theater plays
diff --git a/lib/layouts/chess.layout b/lib/layouts/chess.layout
index 857defb37a..5fe3bbad94 100644
--- a/lib/layouts/chess.layout
+++ b/lib/layouts/chess.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[article]{Chess}
+#  \DeclareLaTeXClass[article,calc.sty,lambda.sty,lyxskak.sty,pst-node.sty]{Chess}
 #  \DeclareCategory{Articles}
 # chess article textclass definition file.
 
diff --git a/lib/layouts/ctex-article.layout b/lib/layouts/ctex-article.layout
index 1fb8217602..052dd8a1ad 100644
--- a/lib/layouts/ctex-article.layout
+++ b/lib/layouts/ctex-article.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this      
-#  \DeclareLaTeXClass[ctexart]{Chinese Article (CTeX)}
+#  \DeclareLaTeXClass[ctexart,savesym.sty,xeCJK.sty]{Chinese Article (CTeX)}
 #  \DeclareCategory{Articles}
 
 Format 68
diff --git a/lib/layouts/ctex-book.layout b/lib/layouts/ctex-book.layout
index b74b4d2c70..674f869e63 100644
--- a/lib/layouts/ctex-book.layout
+++ b/lib/layouts/ctex-book.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this      
-#  \DeclareLaTeXClass[ctexbook]{Chinese Book (CTeX)}
+#  \DeclareLaTeXClass[ctexbook,savesym.sty,xeCJK.sty]{Chinese Book (CTeX)}
 #  \DeclareCategory{Books}
 
 Format 68
diff --git a/lib/layouts/ctex-report.layout b/lib/layouts/ctex-report.layout
index 135517b76c..5a7c318ee4 100644
--- a/lib/layouts/ctex-report.layout
+++ b/lib/layouts/ctex-report.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this      
-#  \DeclareLaTeXClass[ctexrep]{Chinese Report (CTeX)}
+#  \DeclareLaTeXClass[ctexrep,savesym.sty,xeCJK.sty]{Chinese Report (CTeX)}
 #  \DeclareCategory{Reports}
 
 Format 68
diff --git a/lib/layouts/doublecol-new.layout b/lib/layouts/doublecol-new.layout
index 633aa5d984..5c386e97f8 100644
--- a/lib/layouts/doublecol-new.layout
+++ b/lib/layouts/doublecol-new.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this      
-#  \DeclareLaTeXClass[doublecol-new]{Inderscience A4 Journals}
+#  \DeclareLaTeXClass[doublecol-new,amsmath.sty,amssymb.sty,bm.sty,calc.sty,color.sty,dcolumn.sty,endnotes.sty,epsf.sty,lastpage.sty,latexsym.sty,leqno.sty,theorem.sty]{Inderscience A4 Journals}
 #  \DeclareCategory{Articles}
 # Layout file for journals with double columns published by Inderscience
 # Publishers Ltd.
diff --git a/lib/layouts/elsart.layout b/lib/layouts/elsart.layout
index 03ddc3fa8e..2976d6df09 100644
--- a/lib/layouts/elsart.layout
+++ b/lib/layouts/elsart.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[elsart]{Elsevier (Obsolete Version)}
+#  \DeclareLaTeXClass[elsart,amssymb.sty,latexsym.sty]{Elsevier (Obsolete Version)}
 #  \DeclareCategory{Obsolete}
 # Author: Rod Pinna <rpinna@civil.uwa.edu.au>
 # The Elsevier doc style also duplicates the theorem
diff --git a/lib/layouts/elsarticle.layout b/lib/layouts/elsarticle.layout
index a2666a0409..0adadf190f 100644
--- a/lib/layouts/elsarticle.layout
+++ b/lib/layouts/elsarticle.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[elsarticle]{Elsevier}
+#  \DeclareLaTeXClass[elsarticle,natbib.sty,pifont.sty]{Elsevier}
 #  \DeclareCategory{Articles}
 # elsarticle textclass definition file.
 # Author: Uwe Stöhr (uwestoehr@web.de)
diff --git a/lib/layouts/entcs.layout b/lib/layouts/entcs.layout
index 8a132a0522..b2599b4e54 100644
--- a/lib/layouts/entcs.layout
+++ b/lib/layouts/entcs.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[entcs]{Electronic Notes in Theor. Comp. Sc. (ENTCS)}
+#  \DeclareLaTeXClass[entcs,amssymb.sty,entcsmacro.sty,hyperref.sty,ifpdf.sty,latexsym.sty,newlfont.sty]{Electronic Notes in Theor. Comp. Sc. (ENTCS)}
 #  \DeclareCategory{Articles}
 # Based on LyX article class; modified to support ENTCS class
 # Reuben Thomas (rrt@sc3d.org)   27/5-2/6/01
diff --git a/lib/layouts/europasscv.layout b/lib/layouts/europasscv.layout
index 085d794a74..2b8f8a4317 100644
--- a/lib/layouts/europasscv.layout
+++ b/lib/layouts/europasscv.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[europasscv]{Europass CV (2013)}
+#  \DeclareLaTeXClass[europasscv,footnote.sty,tabu.sty,totpages.sty]{Europass CV (2013)}
 #  \DeclareCategory{Curricula Vitae}
 #
 # Layout definition file for the europasscv class package.
diff --git a/lib/layouts/europecv.layout b/lib/layouts/europecv.layout
index 059c67ef79..457f5b9f06 100644
--- a/lib/layouts/europecv.layout
+++ b/lib/layouts/europecv.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[europecv]{Europe CV}
+#  \DeclareLaTeXClass[europecv,fancyhdr.sty,longtable.sty,ucs.sty]{Europe CV}
 #  \DeclareCategory{Curricula Vitae}
 # europe CV textclass definition file.
 # Author : Uwe Stöhr (uwestoehr@web.de)
diff --git a/lib/layouts/heb-article.layout b/lib/layouts/heb-article.layout
index ed32c2976d..3e544a81af 100644
--- a/lib/layouts/heb-article.layout
+++ b/lib/layouts/heb-article.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[article]{Hebrew Article}
+#  \DeclareLaTeXClass[article,theorem.sty]{Hebrew Article}
 #  \DeclareCategory{Articles}
 # Hebrew article textclass definition file.
 # Author: Dekel Tsur <dekel@math.tau.ac.il>
diff --git a/lib/layouts/hollywood.layout b/lib/layouts/hollywood.layout
index 09e671145b..c2d6108a2c 100644
--- a/lib/layouts/hollywood.layout
+++ b/lib/layouts/hollywood.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[hollywood]{Hollywood}
+#  \DeclareLaTeXClass[hollywood,calc.sty,fancyhdr.sty,ulem.sty]{Hollywood}
 #  \DeclareCategory{Scripts}
 # This layout follows the current Hollywood standard for movie scripts
 #
diff --git a/lib/layouts/ijmpc.layout b/lib/layouts/ijmpc.layout
index 1aa75eac6b..b73e635594 100644
--- a/lib/layouts/ijmpc.layout
+++ b/lib/layouts/ijmpc.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[ws-ijmpc]{Int. Journal of Modern Physics C}
+#  \DeclareLaTeXClass[ws-ijmpc,amsmath.sty,amssymb.sty,rotating.sty]{Int. Journal of Modern Physics C}
 #  \DeclareCategory{Articles}
 #
 # Textclass definition file for ws-ijmpc.cls
diff --git a/lib/layouts/ijmpd.layout b/lib/layouts/ijmpd.layout
index 74523f5875..0650b9cb8a 100644
--- a/lib/layouts/ijmpd.layout
+++ b/lib/layouts/ijmpd.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[ws-ijmpd]{Int. Journal of Modern Physics D}
+#  \DeclareLaTeXClass[ws-ijmpd,amsmath.sty,amssymb.sty,rotating.sty]{Int. Journal of Modern Physics D}
 #  \DeclareCategory{Articles}
 #
 # Textclass definition file for ws-ijmpd.cls
diff --git a/lib/layouts/iopart.layout b/lib/layouts/iopart.layout
index e52de7c925..794294f59b 100644
--- a/lib/layouts/iopart.layout
+++ b/lib/layouts/iopart.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[iopart]{Institute of Physics (IOP)}
+#  \DeclareLaTeXClass[iopart,amsmath.sty,amssymb.sty,iopams.sty,setstack.sty]{Institute of Physics (IOP)}
 #  \DeclareCategory{Articles}
 # IOP article textclass definition file.
 # Author: Uwe Stöhr (uwestoehr@web.de)
diff --git a/lib/layouts/isprs.layout b/lib/layouts/isprs.layout
index 4a0bbce608..7f44ed28fb 100644
--- a/lib/layouts/isprs.layout
+++ b/lib/layouts/isprs.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[isprs]{Int. Society f. Photogrammetry and Remote Sensing (ISPRS)}
+#  \DeclareLaTeXClass[isprs,epsfig.sty,times.sty]{Int. Society f. Photogrammetry and Remote Sensing (ISPRS)}
 #  \DeclareCategory{Articles}
 # Find the class file at, e.g.,
 #     http://www.photogrammetry.ethz.ch/tarasp_workshop/isprs.cls
diff --git a/lib/layouts/iucr.layout b/lib/layouts/iucr.layout
index d9e865a086..06a7aa16eb 100644
--- a/lib/layouts/iucr.layout
+++ b/lib/layouts/iucr.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[iucr]{International Union of Crystallography (IUCr)}
+#  \DeclareLaTeXClass[iucr,float.sty,harvard.sty,html.sty,multicol.sty,tabularx.sty]{International Union of Crystallography (IUCr)}
 #  \DeclareCategory{Articles}
 # IUCr article textclass definition file.
 # Author: Uwe Stöhr (uwestoehr@web.de)
diff --git a/lib/layouts/jgrga.layout b/lib/layouts/jgrga.layout
index 93932088a0..4e1a6b6233 100644
--- a/lib/layouts/jgrga.layout
+++ b/lib/layouts/jgrga.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[aguplus]{American Geophysical Union (AGUPLUS JGR)}
+#  \DeclareLaTeXClass[aguplus,jgrga.sty]{American Geophysical Union (AGUPLUS JGR)}
 #  \DeclareCategory{Articles}
 # AGUplus JGR textclass definition file.
 # Author: Martin Vermeer <martin.vermeer@hut.fi>
diff --git a/lib/layouts/jss.layout b/lib/layouts/jss.layout
index fa27126368..ad165dda6a 100644
--- a/lib/layouts/jss.layout
+++ b/lib/layouts/jss.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this      
-#  \DeclareLaTeXClass[jss]{Journal of Statistical Software (JSS) version 2}
+#  \DeclareLaTeXClass[jss,ae.sty,color.sty,fancyvrb.sty,hyperref.sty,natbib.sty,upquote.sty]{Journal of Statistical Software (JSS) version 2}
 #  \DeclareCategory{Articles}
 # Journal of Statistical Software (JSS) article textclass definition file
 # Author: Andreas Karlsson <andreas.karlsson@ltv.se>
diff --git a/lib/layouts/latex8.layout b/lib/layouts/latex8.layout
index 5fa65bcd1b..601bbb9c6d 100644
--- a/lib/layouts/latex8.layout
+++ b/lib/layouts/latex8.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[article]{Latex8 Article (Obsolete)}
+#  \DeclareLaTeXClass[article,latex8.sty,times.sty]{Latex8 Article (Obsolete)}
 #  \DeclareCategory{Obsolete}
 # Latex8 textclass definition file.
 # Author : Allan Rae <rae@elec.uq.edu.au>
diff --git a/lib/layouts/llncs.layout b/lib/layouts/llncs.layout
index 9c1ed98a3c..e0368963aa 100644
--- a/lib/layouts/llncs.layout
+++ b/lib/layouts/llncs.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[llncs]{Lecture Notes in Comp. Science (LNCS)}
+#  \DeclareLaTeXClass[llncs,aliascnt.sty,multicol.sty]{Lecture Notes in Comp. Science (LNCS)}
 #  \DeclareCategory{Articles}
 # llncs (article) textclass definition file.
 # --------
diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index 28271c6620..6a6272cc03 100644
--- a/lib/layouts/moderncv.layout
+++ b/lib/layouts/moderncv.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[moderncv]{Modern CV}
+#  \DeclareLaTeXClass[moderncv,ebgaramond.sty,fancyhdr.sty,fontawesome.sty,ifpdf.sty,marvosym.sty]{Modern CV}
 #  \DeclareCategory{Curricula Vitae}
 # textclass definition file for modernCV 2.0.x
 # (also works with modernCV 1.5.x)
diff --git a/lib/layouts/powerdot.layout b/lib/layouts/powerdot.layout
index d38c6caa3c..a2c253a8b0 100644
--- a/lib/layouts/powerdot.layout
+++ b/lib/layouts/powerdot.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[powerdot]{Powerdot}
+#  \DeclareLaTeXClass[powerdot,enumitem.sty,hyperref.sty,pstricks.sty,pst-grad.sty,verbatim.sty,xcolor.sty,xkeyval.sty]{Powerdot}
 #  \DeclareCategory{Presentations}
 # PowerDot textclass definition file.
 # Created: 29-Aug-05 by Mael Hilléreau
diff --git a/lib/layouts/revtex.layout b/lib/layouts/revtex.layout
index 6b99a28bc9..6cc666ab09 100644
--- a/lib/layouts/revtex.layout
+++ b/lib/layouts/revtex.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[revtex]{REVTeX (Obsolete Version)}
+#  \DeclareLaTeXClass[revtex,revtex.sty]{REVTeX (Obsolete Version)}
 #  \DeclareCategory{Obsolete}
 # RevTeX textclass definition file. Based on:
 # AMS-Article textclass definition file. Taken from initial LyX source code
diff --git a/lib/layouts/revtex4-1.layout b/lib/layouts/revtex4-1.layout
index 6252e2dc2c..9cd9888a8b 100644
--- a/lib/layouts/revtex4-1.layout
+++ b/lib/layouts/revtex4-1.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[revtex4-1]{REVTeX (V. 4.1)}
+#  \DeclareLaTeXClass[revtex4-1,natbib.sty,revsymb4-1.sty,textcase.sty,url.sty]{REVTeX (V. 4.1)}
 #  \DeclareCategory{Articles}
 # REVTeX 4.1 textclass definition file.
 # Based on official article.layout, revtex4.layout and stdclass.inc definition files,
diff --git a/lib/layouts/revtex4.layout b/lib/layouts/revtex4.layout
index 3580d03504..a6181c5fce 100644
--- a/lib/layouts/revtex4.layout
+++ b/lib/layouts/revtex4.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[revtex4]{REVTeX (V. 4)}
+#  \DeclareLaTeXClass[revtex4,natbib.sty,revsymb.sty]{REVTeX (V. 4)}
 #  \DeclareCategory{Articles}
 # RevTeX 4 textclass definition file. Based on:
 # AMS-Article textclass definition file. Taken from initial LyX source code
diff --git a/lib/layouts/sciposter.layout b/lib/layouts/sciposter.layout
index cc7db79013..8ce2239939 100644
--- a/lib/layouts/sciposter.layout
+++ b/lib/layouts/sciposter.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[sciposter]{SciPoster}
+#  \DeclareLaTeXClass[sciposter,sectionbox.sty,wallpaper.sty]{SciPoster}
 #  \DeclareCategory{Posters}
 # Wrapper layout for the sciposter.cls poster class
 #
diff --git a/lib/layouts/scrarticle-beamer.layout b/lib/layouts/scrarticle-beamer.layout
index 402fd568a0..197c0d7fe2 100644
--- a/lib/layouts/scrarticle-beamer.layout
+++ b/lib/layouts/scrarticle-beamer.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[scrartcl]{Beamer Article (KOMA-Script)}
+#  \DeclareLaTeXClass[scrartcl,beamerarticle.sty,keyval.sty,pgf.sty]{Beamer Article (KOMA-Script)}
 #  \DeclareCategory{Articles}
 # Author: Jürgen Spitzmüller <spitz@lyx.org>
 
diff --git a/lib/layouts/seminar.layout b/lib/layouts/seminar.layout
index 5402c0f2e9..9fa19f691a 100644
--- a/lib/layouts/seminar.layout
+++ b/lib/layouts/seminar.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[seminar]{Seminar}
+#  \DeclareLaTeXClass[seminar,sem-page.sty]{Seminar}
 #  \DeclareCategory{Presentations}
 # Versions:
 #   1.0 Initial attemt at makeing a LyX layout file for the seminar class.
diff --git a/lib/layouts/sigplanconf.layout b/lib/layouts/sigplanconf.layout
index 37d4c0376a..0613e2dc5e 100644
--- a/lib/layouts/sigplanconf.layout
+++ b/lib/layouts/sigplanconf.layout
@@ -1,5 +1,5 @@
 #% Do not delete he line below; configure depends on this
-#  \DeclareLaTeXClass[sigplanconf]{ACM SIGPLAN (Obsolete)}
+#  \DeclareLaTeXClass[sigplanconf,natbib.sty]{ACM SIGPLAN (Obsolete)}
 #  \DeclareCategory{Obsolete}
 # ACM SIGPLAN sigplanconf textclass definition file.
 # Author : Uwe Stöhr
diff --git a/lib/layouts/singlecol-new.layout b/lib/layouts/singlecol-new.layout
index c15ada61cd..7e392bab6f 100644
--- a/lib/layouts/singlecol-new.layout
+++ b/lib/layouts/singlecol-new.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this      
-#  \DeclareLaTeXClass[singlecol-new]{Inderscience 9.5 x 6.5 Journals}
+#  \DeclareLaTeXClass[singlecol-new,amsmath.sty,amssymb.sty,bm.sty,calc.sty,color.sty,dcolumn.sty,endnotes.sty,epsf.sty,lastpage.sty,latexsym.sty,leqno.sty,theorem.sty]{Inderscience 9.5 x 6.5 Journals}
 #  \DeclareCategory{Articles}
 # Layout file for journals with single column published by Inderscience
 # Publishers Ltd.
diff --git a/lib/layouts/singlecol.layout b/lib/layouts/singlecol.layout
index 90ccaa762d..afe30c902a 100644
--- a/lib/layouts/singlecol.layout
+++ b/lib/layouts/singlecol.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this      
-#  \DeclareLaTeXClass[singlecol]{Inderscience Journals (Obsolete)}
+#  \DeclareLaTeXClass[singlecol, natbib.sty]{Inderscience Journals (Obsolete)}
 #  \DeclareCategory{Obsolete}
 
 # Read the definitions from article.layout
diff --git a/lib/layouts/spie.layout b/lib/layouts/spie.layout
index 411ad4b773..d41456c853 100644
--- a/lib/layouts/spie.layout
+++ b/lib/layouts/spie.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[spie]{SPIE Proceedings}
+#  \DeclareLaTeXClass[spie,cite.sty]{SPIE Proceedings}
 #  \DeclareCategory{Articles}
 # SPIE-Article textclass definition file.
 # Author : Guenter Milde <g.milde@physik.tu-dresden.de>
diff --git a/lib/layouts/svglobal.layout b/lib/layouts/svglobal.layout
index deb0215ad6..60dbe9420c 100644
--- a/lib/layouts/svglobal.layout
+++ b/lib/layouts/svglobal.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[svjour]{Springer's Global Journal Template (Obsolete Version)}
+#  \DeclareLaTeXClass[svjour,svglobal.clo]{Springer's Global Journal Template (Obsolete Version)}
 #  \DeclareCategory{Obsolete}
 # svjour/global (article) textclass definition file.
 # for various Springer Verlag Journals for which no specific file exists (Global).
diff --git a/lib/layouts/svglobal3.layout b/lib/layouts/svglobal3.layout
index 85aa7d60be..c40d46041a 100644
--- a/lib/layouts/svglobal3.layout
+++ b/lib/layouts/svglobal3.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[svjour3]{Springer's Global Journal Template (V. 3)}
+#  \DeclareLaTeXClass[svjour3,svglov3.clo,natbib.sty]{Springer's Global Journal Template (V. 3)}
 #  \DeclareCategory{Articles}
 # svjour3/global (article) textclass definition file.
 # for various Springer Verlag Journals for which no specific file exists (Global).
diff --git a/lib/layouts/svjog.layout b/lib/layouts/svjog.layout
index 829c7e9356..04feb3f5ff 100644
--- a/lib/layouts/svjog.layout
+++ b/lib/layouts/svjog.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[svjour]{Journal of Geodesy (Springer)}
+#  \DeclareLaTeXClass[svjour,svjog.clo,natbib.sty]{Journal of Geodesy (Springer)}
 #  \DeclareCategory{Articles}
 # svjour/jog (article) textclass definition file.
 # for Springer Verlag Journal of Geodesy.
diff --git a/lib/layouts/svmult.layout b/lib/layouts/svmult.layout
index f5a0691ecc..0e833a5cab 100644
--- a/lib/layouts/svmult.layout
+++ b/lib/layouts/svmult.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[svmult]{Springer Contributed Books (svmult)}
+#  \DeclareLaTeXClass[svmult,natbib.sty]{Springer Contributed Books (svmult)}
 #  \DeclareCategory{Books}
 #  Author: Koji Yokota <yokota@res.otaru-uc.ac.jp>
 #          adapted: Marcus Kriele <mkriele@mac.com> and Uwe Stöhr (April 2011)
diff --git a/lib/layouts/svprobth.layout b/lib/layouts/svprobth.layout
index 361700a6f7..7010743857 100644
--- a/lib/layouts/svprobth.layout
+++ b/lib/layouts/svprobth.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[svjour]{Probability Theory and Related Fields (Springer svprobth)}
+#  \DeclareLaTeXClass[svjour,svprobth.clo]{Probability Theory and Related Fields (Springer svprobth)}
 #  \DeclareCategory{Articles}
 # svjour/probth (article) textclass definition file.
 # for Springer Verlag Journal "Probability Theory and Related Fields".
diff --git a/lib/layouts/tarticle.layout b/lib/layouts/tarticle.layout
index ab8d950692..0f98395ac2 100644
--- a/lib/layouts/tarticle.layout
+++ b/lib/layouts/tarticle.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[tarticle]{Japanese Article (Standard Class: Vertical Writing)}
+#  \DeclareLaTeXClass[tarticle,plext.sty]{Japanese Article (Standard Class: Vertical Writing)}
 #  \DeclareCategory{Articles}
 # Definition file of Japanese article textclass for vertical writing.
 # Author : Koji Yokota (yokota6@gmail.com)1
diff --git a/lib/layouts/tbook.layout b/lib/layouts/tbook.layout
index d54c39d9d2..93cc824124 100644
--- a/lib/layouts/tbook.layout
+++ b/lib/layouts/tbook.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[tbook]{Japanese Book (Standard Class: Vertical Writing)}
+#  \DeclareLaTeXClass[tbook,plext.sty]{Japanese Book (Standard Class: Vertical Writing)}
 #  \DeclareCategory{Books}
 # Definition file of Japanese book textclass for vertical writing.
 # Author : Koji Yokota (yokota6@gmail.com)
diff --git a/lib/layouts/treport.layout b/lib/layouts/treport.layout
index 2cd1f065d3..8e1ec279c5 100644
--- a/lib/layouts/treport.layout
+++ b/lib/layouts/treport.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[treport]{Japanese Report (Vertical Writing)}
+#  \DeclareLaTeXClass[treport,plext.sty]{Japanese Report (Vertical Writing)}
 #  \DeclareCategory{Reports}
 # Definition file of Japanese report textclass for vertical writing.
 # Author : Koji Yokota (yokota@res.otaru-uc.ac.jp)