diff --git a/INSTALL.scons b/INSTALL.scons
index 799463bc10..f8b5757099 100644
--- a/INSTALL.scons
+++ b/INSTALL.scons
@@ -184,7 +184,7 @@ A typical working sequence:
     (build lyx, client and tex2lyx, options like qt_dir will be carried
     over here)
   > scons rebuild=lyxbase
-    (working on lyx_main.C, so only need to rebuild lyxbase)
+    (working on LyX.cpp, so only need to rebuild lyxbase)
   > scons
     (build again, only lyxbase will be rebuilt)
   > scons prefix=/usr/site DESTDIR=/install/dir
diff --git a/config/spell.m4 b/config/spell.m4
index f60cdbfe4e..0152081d85 100644
--- a/config/spell.m4
+++ b/config/spell.m4
@@ -33,7 +33,7 @@ AC_DEFUN([CHECK_WITH_PSPELL],
     test "$with_pspell" = "no" && lyx_use_pspell=false
 
     if $lyx_use_pspell ; then
-	AC_CHECK_HEADERS(pspell/pspell.h,, lyx_use_pspell=false)
+	AC_CHECK_HEADERS(pspell/PSpell.h,, lyx_use_pspell=false)
 	AC_CHECK_LIB(pspell, main, LIBS="-lpspell $LIBS", lyx_use_pspell=false)
 
 	AC_MSG_CHECKING([whether to use pspell])
diff --git a/configure.ac b/configure.ac
index c19cefc7fd..9fda6eeb06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process with autoconf to generate configure script   -*- sh -*-
 AC_INIT(LyX,1.5.0svn,[lyx-devel@lists.lyx.org],[lyx])
 AC_SUBST(LYX_DATE, ["Sat, April 21, 2007"])
 AC_PREREQ(2.52)
-AC_CONFIG_SRCDIR(src/main.C)
+AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([src/config.h])
 
 AC_CONFIG_AUX_DIR(config)
diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index a88331af48..e310bf3df1 100644
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -24,15 +24,15 @@ file(GLOB lyx_sources ${TOP_SRC_DIR}/src/${LYX_CPP_FILES})
 file(GLOB lyx_headers ${TOP_SRC_DIR}/src/${LYX_HPP_FILES})
 
 list(REMOVE_ITEM lyx_sources
-	${TOP_SRC_DIR}/src/aspell.C
-	${TOP_SRC_DIR}/src/pspell.C
-	${TOP_SRC_DIR}/src/ispell.C
-	${TOP_SRC_DIR}/src/Variables.C
-	${TOP_SRC_DIR}/src/Sectioning.C)
+	${TOP_SRC_DIR}/src/ASpell.cpp
+	${TOP_SRC_DIR}/src/PSpell.cpp
+	${TOP_SRC_DIR}/src/ISpell.cpp
+	${TOP_SRC_DIR}/src/Variables.cpp
+	${TOP_SRC_DIR}/src/Section.cpp)
 	
 if(ASPELL_FOUND)
 	include_directories(${ASPELL_INCLUDE_DIR})
-	set(lyx_sources ${lyx_sources} ${TOP_SRC_DIR}/src/aspell.C)
+	set(lyx_sources ${lyx_sources} ${TOP_SRC_DIR}/src/ASpell.cpp)
 endif(ASPELL_FOUND)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/development/cmake/src/tex2lyx/CMakeLists.txt b/development/cmake/src/tex2lyx/CMakeLists.txt
index 455b93e7d0..ab414e8c6e 100644
--- a/development/cmake/src/tex2lyx/CMakeLists.txt
+++ b/development/cmake/src/tex2lyx/CMakeLists.txt
@@ -9,34 +9,34 @@ project(tex2lyx)
 
 
 set(LINKED_FILES
-	${TOP_SRC_DIR}/src/FloatList.C
-	${TOP_SRC_DIR}/src/Floating.C
-	${TOP_SRC_DIR}/src/counters.C
-	${TOP_SRC_DIR}/src/lyxlayout.C
-	${TOP_SRC_DIR}/src/lyxtextclass.C
-	${TOP_SRC_DIR}/src/lyxlex.C
+	${TOP_SRC_DIR}/src/FloatList.cpp
+	${TOP_SRC_DIR}/src/Floating.cpp
+	${TOP_SRC_DIR}/src/Counters.cpp
+	${TOP_SRC_DIR}/src/LyXLayout.cpp
+	${TOP_SRC_DIR}/src/LyXTextClass.cpp
+	${TOP_SRC_DIR}/src/LyXLex.cpp
 )
 
 set(tex2lyx_sources
-	${TOP_SRC_DIR}/src/tex2lyx/boost.C
+	${TOP_SRC_DIR}/src/tex2lyx/boost.cpp
 	${TOP_SRC_DIR}/src/tex2lyx/context.C
-	${TOP_SRC_DIR}/src/tex2lyx/gettext.C
-	${TOP_SRC_DIR}/src/tex2lyx/lengthcommon.C
-	${TOP_SRC_DIR}/src/tex2lyx/lyxfont.C
+	${TOP_SRC_DIR}/src/tex2lyx/gettext.cpp
+	${TOP_SRC_DIR}/src/tex2lyx/lengthcommon.cpp
+	${TOP_SRC_DIR}/src/tex2lyx/LyXFont.cpp
 	${TOP_SRC_DIR}/src/tex2lyx/texparser.C
 	${TOP_SRC_DIR}/src/tex2lyx/tex2lyx.C
 	${TOP_SRC_DIR}/src/tex2lyx/preamble.C
 	${TOP_SRC_DIR}/src/tex2lyx/math.C
 	${TOP_SRC_DIR}/src/tex2lyx/table.C
-	${TOP_SRC_DIR}/src/tex2lyx/text.C
+	${TOP_SRC_DIR}/src/tex2lyx/text.cpp
 )
 
 set(tex2lyx_headers
-	${TOP_SRC_DIR}/src/lyxlayout.h
-	${TOP_SRC_DIR}/src/lyxtextclass.h
+	${TOP_SRC_DIR}/src/LyXLayout.h
+	${TOP_SRC_DIR}/src/LyXTextClass.h
 	${TOP_SRC_DIR}/src/tex2lyx/Spacing.h
 	${TOP_SRC_DIR}/src/tex2lyx/context.h
-	${TOP_SRC_DIR}/src/tex2lyx/lyxfont.h
+	${TOP_SRC_DIR}/src/tex2lyx/LyXFont.h
 	${TOP_SRC_DIR}/src/tex2lyx/texparser.h
 	${TOP_SRC_DIR}/src/tex2lyx/tex2lyx.h
 )
@@ -44,13 +44,13 @@ set(tex2lyx_headers
 include_directories(BEFORE ${TOP_SRC_DIR}/src/tex2lyx)
 
 if(MSVC)
-	SET_SOURCE_FILES_PROPERTIES(${TOP_SRC_DIR}/src/lyxlayout.C ${TOP_SRC_DIR}/src/lyxtextclass.C
+	SET_SOURCE_FILES_PROPERTIES(${TOP_SRC_DIR}/src/LyXLayout.cpp ${TOP_SRC_DIR}/src/LyXTextClass.cpp
 	 	PROPERTIES COMPILE_FLAGS 
-		"/FI${TOP_SRC_DIR}/src/tex2lyx/lyxfont.h /FI${TOP_SRC_DIR}/src/tex2lyx/Spacing.h")
+		"/FI${TOP_SRC_DIR}/src/tex2lyx/LyXFont.h /FI${TOP_SRC_DIR}/src/tex2lyx/Spacing.h")
 else(MSVC)
-	SET_SOURCE_FILES_PROPERTIES(${TOP_SRC_DIR}/src/lyxlayout.C ${TOP_SRC_DIR}/src/lyxtextclass.C
+	SET_SOURCE_FILES_PROPERTIES(${TOP_SRC_DIR}/src/LyXLayout.cpp ${TOP_SRC_DIR}/src/LyXTextClass.cpp
 	 	PROPERTIES COMPILE_FLAGS 
-		"-include ${TOP_SRC_DIR}/src/tex2lyx/lyxfont.h -include ${TOP_SRC_DIR}/src/tex2lyx/Spacing.h")
+		"-include ${TOP_SRC_DIR}/src/tex2lyx/LyXFont.h -include ${TOP_SRC_DIR}/src/tex2lyx/Spacing.h")
 endif(MSVC)
 
 #TODO
diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 591c27700f..fc336566cc 100644
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -1793,8 +1793,8 @@ if build_tex2lyx:
     print "Processing files in src/tex2lyx..."
 
     #
-    for file in ['FloatList.C', 'Floating.C', 'counters.C', 'lyxlayout.h', 'lyxlayout.C', 
-        'lyxtextclass.h', 'lyxtextclass.C', 'lyxlex.C', 'lyxlex_pimpl.C']:
+    for file in ['FloatList.cpp', 'Floating.cpp', 'Counters.cpp', 'LyXLayout.h', 'LyXLayout.cpp', 
+        'LyXTextClass.h', 'LyXTextClass.cpp', 'LyXLex.cpp', 'lyxlex_pimpl.C']:
         frontend_env.Command('$BUILDDIR/common/tex2lyx/'+file, '$TOP_SRCDIR/src/'+file,
             [Copy('$TARGET', '$SOURCE')])
 
@@ -1824,14 +1824,14 @@ if build_lyxbase:
     env.substFile('$BUILDDIR/common/version.C', '$TOP_SRCDIR/src/version.C.in')
 
     if env.has_key('USE_ASPELL') and env['USE_ASPELL']:
-        src_post_files.append('aspell.C')
+        src_post_files.append('ASpell.cpp')
     elif env.has_key('USE_PSPELL') and env['USE_PSPELL']:
-        src_post_files.append('pspell.C')
+        src_post_files.append('PSpell.cpp')
     elif env.has_key('USE_ISPELL') and env['USE_ISPELL']:
-        src_post_files.append('ispell.C')
+        src_post_files.append('ISpell.cpp')
 
     # msvc requires at least one source file with main()
-    # so I exclude main.C from lyxbase
+    # so I exclude main.cpp from lyxbase
     lyxbase_pre = env.StaticLibrary(
         target = '$LOCALLIBPATH/lyxbase_pre',
         source = ['$BUILDDIR/common/%s' % x for x in src_pre_files]
@@ -1850,7 +1850,7 @@ if build_lyx:
     #
     lyx = frontend_env.Program(
         target = '$BUILDDIR/lyx',
-        source = ['$BUILDDIR/common/main.C'] + \
+        source = ['$BUILDDIR/common/main.cpp'] + \
             utils.createResFromIcon(frontend_env, 'lyx_32x32.ico', '$LOCALLIBPATH/lyx.rc'),
         LIBS = [
             'lyxbase_pre',
diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 74ade016aa..96fa789f19 100644
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -910,46 +910,46 @@ src_frontends_qt4_files = Split('''
 
 src_client_header_files = Split('''
     debug.h
-    messages.h
+    Messages.h
 ''')
 
 
 src_client_files = Split('''
-    boost.C
+    boost.cpp
     client.C
-    debug.C
-    gettext.C
-    messages.C
+    debug.cpp
+    gettext.cpp
+    Messages.cpp
 ''')
 
 
 src_tex2lyx_header_files = Split('''
     Spacing.h
     context.h
-    lyxfont.h
+    LyXFont.h
     tex2lyx.h
     texparser.h
 ''')
 
 
 src_tex2lyx_files = Split('''
-    FloatList.C
-    Floating.C
-    boost.C
+    FloatList.cpp
+    Floating.cpp
+    boost.cpp
     context.C
-    counters.C
-    gettext.C
-    lengthcommon.C
-    lyxfont.C
-    lyxlayout.C
-    lyxlex.C
-    lyxtextclass.C
+    Counters.cpp
+    gettext.cpp
+    lengthcommon.cpp
+    LyXFont.cpp
+    LyXLayout.cpp
+    LyXLex.cpp
+    LyXTextClass.cpp
     math.C
     preamble.C
     table.C
     tex2lyx.C
     texparser.C
-    text.C
+    text.cpp
 ''')
 
 
@@ -959,7 +959,7 @@ src_header_files = Split('''
     BufferView.h
     Bullet.h
     Chktex.h
-    Color.h
+    color.h
     ConverterCache.h
     CutAndPaste.h
     DepTable.h
@@ -978,7 +978,7 @@ src_header_files = Split('''
     ParagraphParameters.h
     PrinterParams.h
     RowList_fwd.h
-    Sectioning.h
+    Section.h
     Spacing.h
     SpellBase.h
     Thesaurus.h
@@ -987,204 +987,204 @@ src_header_files = Split('''
     UpdateFlags.h
     Variables.h
     WordLangTuple.h
-    aspell_local.h
-    author.h
-    box.h
-    buffer.h
+    ASpell_local.h
+    Author.h
+    Box.h
+    Buffer.h
     buffer_funcs.h
-    bufferlist.h
-    bufferparams.h
+    BufferList.h
+    BufferParams.h
     bufferview_funcs.h
-    changes.h
-    converter.h
-    coordcache.h
-    counters.h
-    cursor.h
-    cursor_slice.h
+    Changes.h
+    Converter.h
+    CoordCache.h
+    Counters.h
+    LCursor.h
+    CursorSlice.h
     debug.h
-    dimension.h
-    dispatchresult.h
-    dociterator.h
-    encoding.h
-    errorlist.h
-    exporter.h
+    Dimension.h
+    DispatchResult.h
+    DocIterator.h
+    Encoding.h
+    ErrorList.h
+    Exporter.h
     factory.h
-    format.h
-    funcrequest.h
+    Format.h
+    FuncRequest.h
     gettext.h
-    graph.h
-    importer.h
-    insetiterator.h
-    intl.h
-    ispell.h
-    kbmap.h
-    kbsequence.h
-    language.h
+    Graph.h
+    Importer.h
+    InsetIterator.h
+    Intl.h
+    ISpell.h
+    kb_keymap.h
+    kb_sequence.h
+    Language.h
     layout.h
     lengthcommon.h
     lfuns.h
     lyx_cb.h
-    lyx_main.h
+    LyX.h
     lyx_sty.h
     lyxfind.h
-    lyxfont.h
-    lyxfunc.h
-    lyxgluelength.h
-    lyxlayout.h
+    LyXFont.h
+    LyXFunc.h
+    LyXGlueLength.h
+    LyXLayout.h
     lyxlayout_ptr_fwd.h
-    lyxlength.h
-    lyxlex.h
-    lyxrc.h
-    lyxrow.h
-    lyxserver.h
-    lyxsocket.h
-    lyxtext.h
-    lyxtextclass.h
-    lyxtextclasslist.h
-    lyxvc.h
-    messages.h
-    metricsinfo.h
-    mover.h
+    LyXLength.h
+    LyXLex.h
+    LyXRC.h
+    Row.h
+    LyXServer.h
+    LyXServerSocket.h
+    LyXText.h
+    LyXTextClass.h
+    LyXTextClassList.h
+    LyXVC.h
+    Messages.h
+    MetricsInfo.h
+    Mover.h
     output.h
     output_docbook.h
     output_latex.h
     output_plaintext.h
-    outputparams.h
+    OutputParams.h
     paper.h
-    paragraph.h
+    Paragraph.h
     paragraph_funcs.h
     ParagraphMetrics.h
-    pariterator.h
-    pspell.h
+    ParIterator.h
+    PSpell.h
     rowpainter.h
-    session.h
+    Session.h
     sgml.h
-    tabular.h
+    LyXTabular.h
     tex-accent.h
     tex-strings.h
-    texrow.h
+    TexRow.h
     TextMetrics.h
     toc.h
-    trans.h
-    trans_decl.h
-    trans_mgr.h
-    undo.h
-    vc-backend.h
+    Trans.h
+    KmodInfo.h
+    TransState.h
+    Undo.h
+    VCBackend.h
     version.h
-    vspace.h
+    VSpace.h
 ''')
 
 
 src_pre_files = Split('''
-    Bidi.C
-    BranchList.C
-    BufferView.C
-    Bullet.C
-    Chktex.C
-    Color.C
-    ConverterCache.C
-    CutAndPaste.C
-    DepTable.C
-    FloatList.C
-    Floating.C
-    FontIterator.C
-    FuncStatus.C
-    InsetList.C
-    LColor.C
-    LaTeX.C
-    LaTeXFeatures.C
-    LyXAction.C
-    MenuBackend.C
-    ParagraphParameters.C
-    Spacing.C
-    TocBackend.C
-    ToolbarBackend.C
-    author.C
-    boost.C
-    buffer.C
-    buffer_funcs.C
-    bufferlist.C
-    bufferparams.C
-    bufferview_funcs.C
-    changes.C
-    converter.C
-    coordcache.C
-    counters.C
-    cursor.C
-    cursor_slice.C
-    debug.C
-    dociterator.C
-    encoding.C
-    errorlist.C
-    exporter.C
-    factory.C
-    format.C
-    funcrequest.C
-    gettext.C
-    graph.C
-    importer.C
-    insetiterator.C
-    intl.C
-    kbmap.C
-    kbsequence.C
-    language.C
-    lengthcommon.C
-    lyx_cb.C
-    lyx_main.C
-    lyx_sty.C
-    lyxfind.C
-    lyxfont.C
-    lyxfunc.C
-    lyxgluelength.C
-    lyxlayout.C
-    lyxlength.C
-    lyxlex.C
-    lyxrc.C
-    lyxrow.C
-    lyxserver.C
-    lyxsocket.C
-    lyxtextclass.C
-    lyxtextclasslist.C
-    lyxvc.C
-    messages.C
-    metricsinfo.C
-    mover.C
-    output.C
-    output_docbook.C
-    output_latex.C
-    output_plaintext.C
-    outputparams.C
-    paragraph.C
-    paragraph_funcs.C
-    ParagraphMetrics.C
-    pariterator.C
-    rowpainter.C
-    session.C
-    sgml.C
-    tex-accent.C
-    tex-strings.C
-    texrow.C
-    text.C
-    text2.C
-    text3.C
-    TextMetrics.C
-    toc.C
-    trans.C
-    trans_mgr.C
-    undo.C
-    vc-backend.C
+    Bidi.cpp
+    BranchList.cpp
+    BufferView.cpp
+    Bullet.cpp
+    Chktex.cpp
+    color.cpp
+    ConverterCache.cpp
+    CutAndPaste.cpp
+    DepTable.cpp
+    FloatList.cpp
+    Floating.cpp
+    FontIterator.cpp
+    FuncStatus.cpp
+    InsetList.cpp
+    LColor.cpp
+    LaTeX.cpp
+    LaTeXFeatures.cpp
+    LyXAction.cpp
+    MenuBackend.cpp
+    ParagraphParameters.cpp
+    Spacing.cpp
+    TocBackend.cpp
+    ToolbarBackend.cpp
+    Author.cpp
+    boost.cpp
+    Buffer.cpp
+    buffer_funcs.cpp
+    BufferList.cpp
+    BufferParams.cpp
+    bufferview_funcs.cpp
+    Changes.cpp
+    Converter.cpp
+    CoordCache.cpp
+    Counters.cpp
+    LCursor.cpp
+    CursorSlice.cpp
+    debug.cpp
+    DocIterator.cpp
+    Encoding.cpp
+    ErrorList.cpp
+    Exporter.cpp
+    factory.cpp
+    Format.cpp
+    FuncRequest.cpp
+    gettext.cpp
+    Graph.cpp
+    Importer.cpp
+    InsetIterator.cpp
+    Intl.cpp
+    kb_keymap.cpp
+    kb_sequence.cpp
+    Language.cpp
+    lengthcommon.cpp
+    lyx_cb.cpp
+    LyX.cpp
+    lyx_sty.cpp
+    lyxfind.cpp
+    LyXFont.cpp
+    LyXFunc.cpp
+    LyXGlueLength.cpp
+    LyXLayout.cpp
+    LyXLength.cpp
+    LyXLex.cpp
+    LyXRC.cpp
+    Row.cpp
+    LyXServer.cpp
+    LyXServerSocket.cpp
+    LyXTextClass.cpp
+    LyXTextClassList.cpp
+    LyXVC.cpp
+    Messages.cpp
+    MetricsInfo.cpp
+    Mover.cpp
+    output.cpp
+    output_docbook.cpp
+    output_latex.cpp
+    output_plaintext.cpp
+    OutputParams.cpp
+    Paragraph.cpp
+    paragraph_funcs.cpp
+    ParagraphMetrics.cpp
+    ParIterator.cpp
+    rowpainter.cpp
+    Session.cpp
+    sgml.cpp
+    tex-accent.cpp
+    tex-strings.cpp
+    TexRow.cpp
+    text.cpp
+    text2.cpp
+    text3.cpp
+    TextMetrics.cpp
+    toc.cpp
+    Trans.cpp
+    TransState.cpp
+    Undo.cpp
+    VCBackend.cpp
     version.C
-    vspace.C
+    VSpace.cpp
 ''')
 
 
 src_post_files = Split('''
-    tabular.C
-    dimension.C
-    PrinterParams.C
-    box.C
-    Thesaurus.C
-    SpellBase.C
+    LyXTabular.cpp
+    Dimension.cpp
+    PrinterParams.cpp
+    Box.cpp
+    Thesaurus.cpp
+    SpellBase.cpp
 ''')
 
 
diff --git a/lib/doc/it/Customization.lyx b/lib/doc/it/Customization.lyx
index 70ea97cc43..00264ecfff 100644
--- a/lib/doc/it/Customization.lyx
+++ b/lib/doc/it/Customization.lyx
@@ -2770,7 +2770,7 @@ LightBlue
 \end_layout
 
 \begin_layout Standard
-La lista completa si trova correntemente solo nel file sorgente LColor.C
+La lista completa si trova correntemente solo nel file sorgente LColor.cpp
 \end_layout
 
 \begin_layout Section
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5c9343fce3..4367f879d1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,20 +1,20 @@
-src/BufferView.C
-src/Chktex.C
-src/CutAndPaste.C
-src/LColor.C
-src/LaTeX.C
-src/MenuBackend.C
-src/SpellBase.C
-src/buffer.C
-src/buffer_funcs.C
-src/bufferlist.C
-src/bufferparams.C
-src/bufferview_funcs.C
-src/client/debug.C
-src/converter.C
-src/debug.C
-src/exporter.C
-src/format.C
+src/BufferView.cpp
+src/Chktex.cpp
+src/CutAndPaste.cpp
+src/LColor.cpp
+src/LaTeX.cpp
+src/MenuBackend.cpp
+src/SpellBase.cpp
+src/Buffer.cpp
+src/buffer_funcs.cpp
+src/BufferList.cpp
+src/BufferParams.cpp
+src/bufferview_funcs.cpp
+src/client/debug.cpp
+src/Converter.cpp
+src/debug.cpp
+src/Exporter.cpp
+src/Format.cpp
 src/frontends/LyXView.cpp
 src/frontends/WorkArea.cpp
 src/frontends/controllers/ControlAboutlyx.cpp
@@ -74,7 +74,7 @@ src/frontends/qt4/Qt2BC.h
 src/frontends/qt4/UrlView.cpp
 src/frontends/qt4/Validator.cpp
 src/gettext.h
-src/importer.C
+src/Importer.cpp
 src/insets/InsetBase.cpp
 src/insets/InsetBibtex.cpp
 src/insets/InsetBox.cpp
@@ -108,16 +108,16 @@ src/insets/InsetVSpace.cpp
 src/insets/InsetWrap.cpp
 src/insets/RenderGraphic.cpp
 src/insets/RenderPreview.cpp
-src/ispell.C
-src/kbsequence.C
-src/lengthcommon.C
-src/lyx_cb.C
-src/lyx_main.C
-src/lyxfind.C
-src/lyxfont.C
-src/lyxfunc.C
-src/lyxrc.C
-src/lyxvc.C
+src/ISpell.cpp
+src/kb_sequence.cpp
+src/lengthcommon.cpp
+src/lyx_cb.cpp
+src/LyX.cpp
+src/lyxfind.cpp
+src/LyXFont.cpp
+src/LyXFunc.cpp
+src/LyXRC.cpp
+src/LyXVC.cpp
 src/mathed/InsetFormulaMacro.cpp
 src/mathed/InsetMathAMSArray.cpp
 src/mathed/InsetMathCases.cpp
@@ -128,16 +128,16 @@ src/mathed/InsetMathRef.cpp
 src/mathed/InsetMathSplit.cpp
 src/mathed/InsetMathSubstack.cpp
 src/mathed/MathMacroTemplate.cpp
-src/output.C
-src/output_plaintext.C
-src/paragraph.C
-src/rowpainter.C
+src/output.cpp
+src/output_plaintext.cpp
+src/Paragraph.cpp
+src/rowpainter.cpp
 src/support/filefilterlist.C
 src/support/os_win32.C
 src/support/package.C.in
 src/support/userinfo.C
-src/tex-strings.C
-src/text.C
-src/text2.C
-src/text3.C
-src/vspace.C
+src/tex-strings.cpp
+src/text.cpp
+src/text2.cpp
+src/text3.cpp
+src/VSpace.cpp
diff --git a/src/Bidi.C b/src/Bidi.C
index 2721ef87ce..5a979eff55 100644
--- a/src/Bidi.C
+++ b/src/Bidi.C
@@ -1,5 +1,5 @@
 /**
- * \file Bidi.C
+ * \file Bidi.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,11 +11,11 @@
 #include <config.h>
 
 #include "Bidi.h"
-#include "buffer.h"
-#include "lyxfont.h"
-#include "lyxrow.h"
-#include "lyxrc.h"
-#include "paragraph.h"
+#include "Buffer.h"
+#include "LyXFont.h"
+#include "Row.h"
+#include "LyXRC.h"
+#include "Paragraph.h"
 
 
 namespace lyx {
diff --git a/src/BranchList.C b/src/BranchList.C
index 9cec82928e..128d27c590 100644
--- a/src/BranchList.C
+++ b/src/BranchList.C
@@ -1,5 +1,5 @@
 /**
- * \file BranchList.C
+ * \file BranchList.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/BranchList.h b/src/BranchList.h
index dd89a261d7..3f2978acee 100644
--- a/src/BranchList.h
+++ b/src/BranchList.h
@@ -30,7 +30,7 @@
 #ifndef BRANCHES_H
 #define BRANCHES_H
 
-#include "Color.h"
+#include "color.h"
 
 #include "support/docstring.h"
 
diff --git a/src/BufferView.C b/src/BufferView.C
index ada0248648..9dd4a53e99 100644
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -1,5 +1,5 @@
 /**
- * \file BufferView.C
+ * \file BufferView.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,44 +16,44 @@
 
 #include "BufferView.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "buffer_funcs.h"
-#include "bufferlist.h"
-#include "bufferparams.h"
+#include "BufferList.h"
+#include "BufferParams.h"
 #include "bufferview_funcs.h"
-#include "coordcache.h"
+#include "CoordCache.h"
 #include "CutAndPaste.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "errorlist.h"
+#include "DispatchResult.h"
+#include "ErrorList.h"
 #include "factory.h"
 #include "FloatList.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
-#include "intl.h"
-#include "insetiterator.h"
-#include "language.h"
+#include "Intl.h"
+#include "InsetIterator.h"
+#include "Language.h"
 #include "LaTeXFeatures.h"
 #include "lyx_cb.h" // added for Dispatch functions
-#include "lyx_main.h"
+#include "LyX.h"
 #include "lyxfind.h"
-#include "lyxfunc.h"
-#include "lyxlayout.h"
-#include "lyxtext.h"
-#include "lyxtextclass.h"
-#include "lyxrc.h"
-#include "session.h"
-#include "paragraph.h"
+#include "LyXFunc.h"
+#include "LyXLayout.h"
+#include "LyXText.h"
+#include "LyXTextClass.h"
+#include "LyXRC.h"
+#include "Session.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
-#include "pariterator.h"
-#include "texrow.h"
+#include "ParIterator.h"
+#include "TexRow.h"
 #include "toc.h"
-#include "undo.h"
-#include "vspace.h"
+#include "Undo.h"
+#include "VSpace.h"
 #include "WordLangTuple.h"
-#include "metricsinfo.h"
+#include "MetricsInfo.h"
 
 #include "insets/InsetBibtex.h"
 #include "insets/InsetCommand.h" // ChangeRefs
@@ -1205,7 +1205,7 @@ bool BufferView::workAreaDispatch(FuncRequest const & cmd0)
 			//metrics_info_.y1 = ymin of button;
 			//metrics_info_.y2 = ymax of button;
 			//
-			// Unfortunately, rowpainter.C:paintText() does not distinguish
+			// Unfortunately, rowpainter.cpp:paintText() does not distinguish
 			// between background updates and text updates. So we use the hammer
 			// solution for now. We could also avoid the updateMetrics() below
 			// by using the first and last pit of the CoordCache. Have a look
diff --git a/src/BufferView.h b/src/BufferView.h
index a4726346c6..c2ea47e027 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -15,9 +15,9 @@
 #ifndef BUFFER_VIEW_H
 #define BUFFER_VIEW_H
 
-#include "coordcache.h"
-#include "cursor.h"
-#include "metricsinfo.h"
+#include "CoordCache.h"
+#include "LCursor.h"
+#include "MetricsInfo.h"
 #include "TextMetrics.h"
 #include "UpdateFlags.h"
 
diff --git a/src/Bullet.C b/src/Bullet.C
index 4104ee60f4..5c0f917419 100644
--- a/src/Bullet.C
+++ b/src/Bullet.C
@@ -1,5 +1,5 @@
 /**
- * \file Bullet.C
+ * \file Bullet.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/Chktex.C b/src/Chktex.C
index 981999f303..d503907646 100644
--- a/src/Chktex.C
+++ b/src/Chktex.C
@@ -1,5 +1,5 @@
 /**
- * \file Chktex.C
+ * \file Chktex.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/Color.C b/src/Color.C
index 0f4789513d..125de64fad 100644
--- a/src/Color.C
+++ b/src/Color.C
@@ -1,5 +1,5 @@
 /**
- * \file Color.C
+ * \file color.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "Color.h"
+#include "color.h"
 
 #include "LColor.h"
 
diff --git a/src/Color.h b/src/Color.h
index ee3d88bf42..7270991f09 100644
--- a/src/Color.h
+++ b/src/Color.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file Color.h
+ * \file color.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/ConverterCache.C b/src/ConverterCache.C
index 19931c2ea7..de97c1f27a 100644
--- a/src/ConverterCache.C
+++ b/src/ConverterCache.C
@@ -1,5 +1,5 @@
 /**
- * \file ConverterCache.C
+ * \file ConverterCache.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,8 +15,8 @@
 #include "ConverterCache.h"
 
 #include "debug.h"
-#include "lyxrc.h"
-#include "mover.h"
+#include "LyXRC.h"
+#include "Mover.h"
 
 #include "support/filetools.h"
 #include "support/lyxlib.h"
diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index 1286d1a94e..d56f8882c1 100644
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -1,5 +1,5 @@
 /*
- * \file CutAndPaste.C
+ * \file CutAndPaste.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,26 +15,26 @@
 
 #include "CutAndPaste.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "buffer_funcs.h"
-#include "bufferparams.h"
-#include "cursor.h"
+#include "BufferParams.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "errorlist.h"
-#include "funcrequest.h"
+#include "ErrorList.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "insetiterator.h"
-#include "language.h"
+#include "InsetIterator.h"
+#include "Language.h"
 #include "lfuns.h"
-#include "lyxfunc.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
-#include "lyxtextclasslist.h"
-#include "paragraph.h"
+#include "LyXFunc.h"
+#include "LyXRC.h"
+#include "LyXText.h"
+#include "LyXTextClassList.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
-#include "pariterator.h"
-#include "undo.h"
+#include "ParIterator.h"
+#include "Undo.h"
 
 #include "insets/InsetCharStyle.h"
 #include "insets/InsetTabular.h"
diff --git a/src/DepTable.C b/src/DepTable.C
index a638dfd98f..c68eef628e 100644
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -1,5 +1,5 @@
 /**
- * \file DepTable.C
+ * \file DepTable.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/FloatList.C b/src/FloatList.C
index 81f7a6e99b..acdc628e7d 100644
--- a/src/FloatList.C
+++ b/src/FloatList.C
@@ -1,5 +1,5 @@
 /**
- * \file FloatList.C
+ * \file FloatList.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/Floating.C b/src/Floating.C
index ddd94a901d..91f87a519e 100644
--- a/src/Floating.C
+++ b/src/Floating.C
@@ -1,5 +1,5 @@
 /**
- * \file Floating.C
+ * \file Floating.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/FontIterator.C b/src/FontIterator.C
index ab97a6f384..6c2c7a272c 100644
--- a/src/FontIterator.C
+++ b/src/FontIterator.C
@@ -1,5 +1,5 @@
 /**
- * \file src/FontIterator.C
+ * \file src/FontIterator.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,9 +14,9 @@
 
 #include "FontIterator.h"
 
-#include "buffer.h"
-#include "lyxtext.h"
-#include "paragraph.h"
+#include "Buffer.h"
+#include "LyXText.h"
+#include "Paragraph.h"
 
 
 namespace lyx {
diff --git a/src/FontIterator.h b/src/FontIterator.h
index 87686bdee1..96277ffcd2 100644
--- a/src/FontIterator.h
+++ b/src/FontIterator.h
@@ -20,7 +20,7 @@
 #ifndef FONTITERATOR_H
 #define FONTITERATOR_H
 
-#include "lyxfont.h"
+#include "LyXFont.h"
 
 #include "support/types.h"
 
diff --git a/src/FuncStatus.C b/src/FuncStatus.C
index 530b8e893a..17e59e677d 100644
--- a/src/FuncStatus.C
+++ b/src/FuncStatus.C
@@ -1,5 +1,5 @@
 /**
- * \file FuncStatus.C
+ * \file FuncStatus.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/InsetList.C b/src/InsetList.C
index e066a171da..27e59280f3 100644
--- a/src/InsetList.C
+++ b/src/InsetList.C
@@ -1,5 +1,5 @@
 /**
- * \file InsetList.C
+ * \file InsetList.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,8 +13,8 @@
 
 #include "InsetList.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BranchList.h"
 #include "debug.h"
 
diff --git a/src/LColor.C b/src/LColor.C
index f99c3e06c5..9af35b0f00 100644
--- a/src/LColor.C
+++ b/src/LColor.C
@@ -1,5 +1,5 @@
 /**
- * \file LColor.C
+ * \file LColor.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -190,7 +190,7 @@ string const LColor::getX11Name(LColor::color c) const
 		return it->second.x11name;
 
 	lyxerr << "LyX internal error: Missing color"
-		  " entry in LColor.C for " << c << '\n'
+		  " entry in LColor.cpp for " << c << '\n'
 	       << "Using black." << endl;
 	return "black";
 }
diff --git a/src/LaTeX.C b/src/LaTeX.C
index 29a7d6b2db..cb922cc5a4 100644
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -1,5 +1,5 @@
 /**
- * \file LaTeX.C
+ * \file LaTeX.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,10 +15,10 @@
 
 #include <config.h>
 
-#include "bufferlist.h"
+#include "BufferList.h"
 #include "LaTeX.h"
 #include "gettext.h"
-#include "lyxrc.h"
+#include "LyXRC.h"
 #include "debug.h"
 #include "DepTable.h"
 
diff --git a/src/LaTeX.h b/src/LaTeX.h
index 821aa0f5b8..f98f90e2c1 100644
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -14,7 +14,7 @@
 #ifndef LATEX_H
 #define LATEX_H
 
-#include "outputparams.h"
+#include "OutputParams.h"
 
 #include "support/docstring.h"
 #include "support/filename.h"
diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 04e58eb4d9..fbc1e7c423 100644
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -1,5 +1,5 @@
 /**
- * \file LaTeXFeatures.C
+ * \file LaTeXFeatures.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,17 +16,17 @@
 
 #include "LaTeXFeatures.h"
 
-#include "bufferparams.h"
-#include "Color.h"
+#include "BufferParams.h"
+#include "color.h"
 #include "debug.h"
-#include "encoding.h"
+#include "Encoding.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "LColor.h"
-#include "language.h"
-#include "lyxlex.h"
+#include "Language.h"
+#include "LyXLex.h"
 #include "lyx_sty.h"
-#include "lyxrc.h"
+#include "LyXRC.h"
 
 #include "support/docstream.h"
 #include "support/filetools.h"
diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 9de20f3c8a..f39699f66a 100644
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -14,7 +14,7 @@
 #define LATEXFEATURES_H
 
 
-#include "outputparams.h"
+#include "OutputParams.h"
 #include "support/docstring.h"
 
 #include <set>
@@ -39,7 +39,7 @@ class Language;
  *  packages which don't have special requirements are handled automatically.
  *  If your new package does need special consideration you'll need to alter
  *  string const getPackages() const;
- *  Remember to update the validate function in buffer.C and paragraph.C
+ *  Remember to update the validate function in Buffer.cpp and Paragraph.cpp
  *  when you do so.
  */
 class LaTeXFeatures {
diff --git a/src/LyXAction.C b/src/LyXAction.C
index d5eb40df3f..89e6311919 100644
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -1,5 +1,5 @@
 /**
- * \file LyXAction.C
+ * \file LyXAction.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,7 +16,7 @@
 #include "LyXAction.h"
 
 #include "debug.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include "support/lstrings.h"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 0afb2f98ea..657c4642ee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,9 +11,9 @@ endif
 SUBDIRS = mathed insets graphics support frontends . $(CLIENT) tex2lyx
 
 EXTRA_DIST = config.h.in stamp-h.in version.C.in \
-	Sectioning.h \
-	Sectioning.C \
-	Variables.C \
+	Section.h \
+	Section.cpp \
+	Variables.cpp \
 	Variables.h \
 	paper.h \
 	pch.h
@@ -35,7 +35,7 @@ EXTRA_PROGRAMS = lyx-qt4
 
 lyx_qt4_LDADD = $(lyx_OBJECTS) $(LYX_PRE_LIBS) \
 	frontends/qt4/libqt4.la $(LYX_POST_LIBS) $(OTHERLIBS)
-lyx_qt4_SOURCES = main.C
+lyx_qt4_SOURCES = main.cpp
 
 lyx$(EXEEXT): $(FRONTENDS_PROGS)
 	rm -f $@
@@ -48,237 +48,237 @@ BUILT_SOURCES = $(PCH_FILE) version.C
 AM_CPPFLAGS += $(PCH_FLAGS) $(BOOST_INCLUDES)
 
 if USE_ASPELL
-ASPELL = aspell.C aspell_local.h
+ASPELL = ASpell.cpp ASpell_local.h
 endif
 if USE_PSPELL
-PSPELL = pspell.C pspell.h
+PSPELL = PSpell.cpp PSpell.h
 endif
 if USE_ISPELL
-ISPELL = ispell.C ispell.h
+ISPELL = ISpell.cpp ISpell.h
 endif
 
 
 
 lyx_SOURCES = \
-	Bidi.C \
+	Bidi.cpp \
 	Bidi.h \
-	BufferView.C \
+	BufferView.cpp \
 	BufferView.h \
-	Bullet.C \
+	Bullet.cpp \
 	Bullet.h \
-	BranchList.C \
+	BranchList.cpp \
 	BranchList.h \
-	Chktex.C \
+	Chktex.cpp \
 	Chktex.h \
-	Color.C \
-	Color.h \
-	ConverterCache.C \
+	color.cpp \
+	color.h \
+	ConverterCache.cpp \
 	ConverterCache.h \
-	CutAndPaste.C \
+	CutAndPaste.cpp \
 	CutAndPaste.h \
-	DepTable.C \
+	DepTable.cpp \
 	DepTable.h \
-	FloatList.C \
+	FloatList.cpp \
 	FloatList.h \
-	Floating.C \
+	Floating.cpp \
 	Floating.h \
-	FontIterator.C \
+	FontIterator.cpp \
 	FontIterator.h \
-	FuncStatus.C \
+	FuncStatus.cpp \
 	FuncStatus.h \
-	InsetList.C \
+	InsetList.cpp \
 	InsetList.h \
-	LColor.C \
+	LColor.cpp \
 	LColor.h \
-	LaTeX.C \
+	LaTeX.cpp \
 	LaTeX.h \
-	LaTeXFeatures.C \
+	LaTeXFeatures.cpp \
 	LaTeXFeatures.h \
-	LyXAction.C \
+	LyXAction.cpp \
 	LyXAction.h \
-	MenuBackend.C \
+	MenuBackend.cpp \
 	MenuBackend.h \
 	ParagraphList.h \
 	ParagraphList_fwd.h \
-	ParagraphParameters.C \
+	ParagraphParameters.cpp \
 	ParagraphParameters.h \
-	PrinterParams.C \
+	PrinterParams.cpp \
 	PrinterParams.h \
 	RowList_fwd.h \
-	Spacing.C \
+	Spacing.cpp \
 	Spacing.h \
-	Thesaurus.C \
+	Thesaurus.cpp \
 	Thesaurus.h \
-	ToolbarBackend.C \
+	ToolbarBackend.cpp \
 	ToolbarBackend.h \
 	UpdateFlags.h \
 	WordLangTuple.h \
-	author.C \
-	author.h \
+	Author.cpp \
+	Author.h \
 	boost.cpp \
-	box.h \
-	box.C \
-	buffer.C \
-	buffer.h \
-	buffer_funcs.C \
+	Box.h \
+	Box.cpp \
+	Buffer.cpp \
+	Buffer.h \
+	buffer_funcs.cpp \
 	buffer_funcs.h \
-	bufferlist.C \
-	bufferlist.h \
-	bufferparams.C \
-	bufferparams.h \
-	bufferview_funcs.C \
+	BufferList.cpp \
+	BufferList.h \
+	BufferParams.cpp \
+	BufferParams.h \
+	bufferview_funcs.cpp \
 	bufferview_funcs.h \
-	changes.C \
-	changes.h \
+	Changes.cpp \
+	Changes.h \
 	config.h.in \
-	converter.C \
-	converter.h \
-	counters.C \
-	counters.h \
-	coordcache.C \
-	coordcache.h \
-	cursor.C \
-	cursor.h \
-	cursor_slice.C \
-	cursor_slice.h \
-	debug.C \
+	Converter.cpp \
+	Converter.h \
+	Counters.cpp \
+	Counters.h \
+	CoordCache.cpp \
+	CoordCache.h \
+	LCursor.cpp \
+	LCursor.h \
+	CursorSlice.cpp \
+	CursorSlice.h \
+	debug.cpp \
 	debug.h \
-	dimension.C \
-	dimension.h \
-	dociterator.C \
-	dociterator.h \
-	dispatchresult.h \
-	encoding.C \
-	encoding.h \
-	errorlist.C \
-	errorlist.h \
-	exporter.C \
-	exporter.h \
-	gettext.C \
+	Dimension.cpp \
+	Dimension.h \
+	DocIterator.cpp \
+	DocIterator.h \
+	DispatchResult.h \
+	Encoding.cpp \
+	Encoding.h \
+	ErrorList.cpp \
+	ErrorList.h \
+	Exporter.cpp \
+	Exporter.h \
+	gettext.cpp \
 	gettext.h \
 	factory.h \
-	factory.C \
-	format.C \
-	format.h \
-	funcrequest.h \
-	funcrequest.C \
-	graph.C \
-	graph.h \
-	importer.C \
-	importer.h \
-	intl.C \
-	intl.h \
-	insetiterator.C \
-	insetiterator.h \
-	kbmap.C \
-	kbmap.h \
-	kbsequence.C \
-	kbsequence.h \
-	language.C \
-	language.h \
-	session.C \
-	session.h \
+	factory.cpp \
+	Format.cpp \
+	Format.h \
+	FuncRequest.h \
+	FuncRequest.cpp \
+	Graph.cpp \
+	Graph.h \
+	Importer.cpp \
+	Importer.h \
+	Intl.cpp \
+	Intl.h \
+	InsetIterator.cpp \
+	InsetIterator.h \
+	kb_keymap.cpp \
+	kb_keymap.h \
+	kb_sequence.cpp \
+	kb_sequence.h \
+	Language.cpp \
+	Language.h \
+	Session.cpp \
+	Session.h \
 	layout.h \
-	lengthcommon.C \
+	lengthcommon.cpp \
 	lengthcommon.h \
 	lfuns.h \
-	lyx_cb.C \
+	lyx_cb.cpp \
 	lyx_cb.h \
-	lyx_main.C \
-	lyx_main.h \
-	lyx_sty.C \
+	LyX.cpp \
+	LyX.h \
+	lyx_sty.cpp \
 	lyx_sty.h \
-	lyxfont.C \
-	lyxfont.h \
-	lyxfind.C \
+	LyXFont.cpp \
+	LyXFont.h \
+	lyxfind.cpp \
 	lyxfind.h \
-	lyxfunc.C \
-	lyxfunc.h \
-	lyxgluelength.C \
-	lyxgluelength.h \
-	lyxlayout.C \
-	lyxlayout.h \
+	LyXFunc.cpp \
+	LyXFunc.h \
+	LyXGlueLength.cpp \
+	LyXGlueLength.h \
+	LyXLayout.cpp \
+	LyXLayout.h \
 	lyxlayout_ptr_fwd.h \
-	lyxlength.C \
-	lyxlength.h \
-	lyxlex.C \
-	lyxlex.h \
-	lyxrc.C \
-	lyxrc.h \
-	lyxrow.C \
-	lyxrow.h \
-	lyxserver.C \
-	lyxserver.h \
-	lyxsocket.C \
-	lyxsocket.h \
-	lyxtext.h \
-	lyxtextclass.C \
-	lyxtextclass.h \
-	lyxtextclasslist.C \
-	lyxtextclasslist.h \
-	lyxvc.C \
-	lyxvc.h \
-	messages.C \
-	messages.h \
-	metricsinfo.C \
-	metricsinfo.h \
-	mover.C \
-	mover.h \
-	output.C \
+	LyXLength.cpp \
+	LyXLength.h \
+	LyXLex.cpp \
+	LyXLex.h \
+	LyXRC.cpp \
+	LyXRC.h \
+	Row.cpp \
+	Row.h \
+	LyXServer.cpp \
+	LyXServer.h \
+	LyXServerSocket.cpp \
+	LyXServerSocket.h \
+	LyXText.h \
+	LyXTextClass.cpp \
+	LyXTextClass.h \
+	LyXTextClassList.cpp \
+	LyXTextClassList.h \
+	LyXVC.cpp \
+	LyXVC.h \
+	Messages.cpp \
+	Messages.h \
+	MetricsInfo.cpp \
+	MetricsInfo.h \
+	Mover.cpp \
+	Mover.h \
+	output.cpp \
 	output.h \
-	outputparams.C \
-	outputparams.h \
-	output_docbook.C \
+	OutputParams.cpp \
+	OutputParams.h \
+	output_docbook.cpp \
 	output_docbook.h \
-	output_latex.C \
+	output_latex.cpp \
 	output_latex.h \
-	output_plaintext.C \
+	output_plaintext.cpp \
 	output_plaintext.h \
 	paper.h \
-	paragraph.C \
-	paragraph.h \
-	ParagraphMetrics.C \
+	Paragraph.cpp \
+	Paragraph.h \
+	ParagraphMetrics.cpp \
 	ParagraphMetrics.h \
-	paragraph_funcs.C \
+	paragraph_funcs.cpp \
 	paragraph_funcs.h \
-	pariterator.C \
-	pariterator.h \
-	$(ASPELL) $(PSPELL) $(ISPELL) SpellBase.C \
+	ParIterator.cpp \
+	ParIterator.h \
+	$(ASPELL) $(PSPELL) $(ISPELL) SpellBase.cpp \
 	SpellBase.h \
-	rowpainter.C \
+	rowpainter.cpp \
 	rowpainter.h \
-	sgml.C \
+	sgml.cpp \
 	sgml.h \
-	tabular.C \
-	tabular.h \
-	tex-accent.C \
+	LyXTabular.cpp \
+	LyXTabular.h \
+	tex-accent.cpp \
 	tex-accent.h \
-	tex-strings.C \
+	tex-strings.cpp \
 	tex-strings.h \
-	texrow.C \
-	texrow.h \
-	text.C \
-	text2.C \
-	text3.C \
-	TextMetrics.C \
+	TexRow.cpp \
+	TexRow.h \
+	text.cpp \
+	text2.cpp \
+	text3.cpp \
+	TextMetrics.cpp \
 	TextMetrics.h \
-	TocBackend.C \
+	TocBackend.cpp \
 	TocBackend.h \
-	toc.C \
+	toc.cpp \
 	toc.h \
-	trans.C \
-	trans.h \
-	trans_decl.h \
-	trans_mgr.C \
-	trans_mgr.h \
-	undo.C \
-	undo.h \
-	vc-backend.C \
-	vc-backend.h \
+	Trans.cpp \
+	Trans.h \
+	KmodInfo.h \
+	TransState.cpp \
+	TransState.h \
+	Undo.cpp \
+	Undo.h \
+	VCBackend.cpp \
+	VCBackend.h \
 	version.C \
 	version.h \
-	vspace.C \
-	vspace.h
+	VSpace.cpp \
+	VSpace.h
 
 version.C: stamp-version
 	@:
diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index bde5fbb48b..3a6ee7b45f 100644
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -1,5 +1,5 @@
 /**
- * \file MenuBackend.C
+ * \file MenuBackend.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -18,24 +18,24 @@
 #include "MenuBackend.h"
 
 #include "BranchList.h"
-#include "buffer.h"
-#include "bufferlist.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferList.h"
+#include "BufferParams.h"
 #include "CutAndPaste.h"
 #include "debug.h"
-#include "exporter.h"
+#include "Exporter.h"
 #include "Floating.h"
 #include "FloatList.h"
-#include "format.h"
+#include "Format.h"
 #include "gettext.h"
-#include "importer.h"
-#include "kbmap.h"
-#include "session.h"
+#include "Importer.h"
+#include "kb_keymap.h"
+#include "Session.h"
 #include "LyXAction.h"
-#include "lyx_main.h" // for lastfiles
-#include "lyxfunc.h"
-#include "lyxlex.h"
-#include "paragraph.h"
+#include "LyX.h" // for lastfiles
+#include "LyXFunc.h"
+#include "LyXLex.h"
+#include "Paragraph.h"
 #include "TocBackend.h"
 #include "ToolbarBackend.h"
 
diff --git a/src/MenuBackend.h b/src/MenuBackend.h
index 903b130630..9ec013d278 100644
--- a/src/MenuBackend.h
+++ b/src/MenuBackend.h
@@ -14,7 +14,7 @@
 #define MENUBACKEND_H
 
 #include "FuncStatus.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/src/ParagraphList.h b/src/ParagraphList.h
index 649df312d3..cc81e9df64 100644
--- a/src/ParagraphList.h
+++ b/src/ParagraphList.h
@@ -12,7 +12,7 @@
 #ifndef PARAGRAPH_LIST_H
 #define PARAGRAPH_LIST_H
 
-#include "paragraph.h"
+#include "Paragraph.h"
 
 #include "support/RandomAccessList.h"
 
diff --git a/src/ParagraphMetrics.C b/src/ParagraphMetrics.C
index 7576bcc224..744e3f28fb 100644
--- a/src/ParagraphMetrics.C
+++ b/src/ParagraphMetrics.C
@@ -1,5 +1,5 @@
 /**
- * \file paragraph.C
+ * \file Paragraph.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -19,25 +19,25 @@
 
 #include "ParagraphMetrics.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
-#include "counters.h"
-#include "encoding.h"
+#include "Buffer.h"
+#include "BufferParams.h"
+#include "Counters.h"
+#include "Encoding.h"
 #include "debug.h"
 #include "gettext.h"
-#include "language.h"
+#include "Language.h"
 #include "LaTeXFeatures.h"
-#include "lyxfont.h"
-#include "lyxrc.h"
-#include "lyxrow.h"
-#include "outputparams.h"
+#include "LyXFont.h"
+#include "LyXRC.h"
+#include "Row.h"
+#include "OutputParams.h"
 #include "paragraph_funcs.h"
 
 #include "rowpainter.h"
 
 #include "sgml.h"
-#include "texrow.h"
-#include "vspace.h"
+#include "TexRow.h"
+#include "VSpace.h"
 
 #include "frontends/FontMetrics.h"
 
diff --git a/src/ParagraphMetrics.h b/src/ParagraphMetrics.h
index 8aebfd10bf..a0babdfdc4 100644
--- a/src/ParagraphMetrics.h
+++ b/src/ParagraphMetrics.h
@@ -17,7 +17,7 @@
 #ifndef PARAGRAPH_METRICS_H
 #define PARAGRAPH_METRICS_H
 
-#include "paragraph.h"
+#include "Paragraph.h"
 
 namespace lyx {
 
diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C
index 0ac99a7850..2121f16ab2 100644
--- a/src/ParagraphParameters.C
+++ b/src/ParagraphParameters.C
@@ -1,5 +1,5 @@
 /**
- * \file ParagraphParameters.C
+ * \file ParagraphParameters.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,12 +16,12 @@
 
 #include "ParagraphParameters.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "gettext.h"
-#include "lyxlayout.h"
-#include "lyxlex.h"
-#include "lyxtext.h"
-#include "paragraph.h"
+#include "LyXLayout.h"
+#include "LyXLex.h"
+#include "LyXText.h"
+#include "Paragraph.h"
 #include "tex-strings.h"
 
 #include "support/lstrings.h"
diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index a432a05e55..c452235d32 100644
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -15,7 +15,7 @@
 #define PARAGRAPHPARAMETERS_H
 
 #include "layout.h"
-#include "lyxlength.h"
+#include "LyXLength.h"
 #include "Spacing.h"
 
 #include "support/types.h"
diff --git a/src/PrinterParams.C b/src/PrinterParams.C
index fdef907ef7..52de90c10c 100644
--- a/src/PrinterParams.C
+++ b/src/PrinterParams.C
@@ -1,5 +1,5 @@
 /**
- * \file PrinterParams.C
+ * \file PrinterParams.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/PrinterParams.h b/src/PrinterParams.h
index 042a083d0f..23690ec06b 100644
--- a/src/PrinterParams.h
+++ b/src/PrinterParams.h
@@ -12,7 +12,7 @@
 #ifndef PRINTERPARAMS_H
 #define PRINTERPARAMS_H
 
-#include "lyxrc.h"
+#include "LyXRC.h"
 
 
 namespace lyx {
diff --git a/src/RowList_fwd.h b/src/RowList_fwd.h
index 168bf6ef70..709b090b1f 100644
--- a/src/RowList_fwd.h
+++ b/src/RowList_fwd.h
@@ -12,7 +12,7 @@
 #ifndef ROW_LIST_FWD_H
 #define ROW_LIST_FWD_H
 
-#include "lyxrow.h"
+#include "Row.h"
 
 #include <vector>
 #include <map>
diff --git a/src/Sectioning.C b/src/Sectioning.C
index 5777a1658e..ed8db6cecc 100644
--- a/src/Sectioning.C
+++ b/src/Sectioning.C
@@ -1,5 +1,5 @@
 /**
- * \file Sectioning.C
+ * \file Section.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "Sectioning.h"
+#include "Section.h"
 
 
 namespace lyx {
diff --git a/src/Sectioning.h b/src/Sectioning.h
index 4f18a6ca36..ff8b148718 100644
--- a/src/Sectioning.h
+++ b/src/Sectioning.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file Sectioning.h
+ * \file Section.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,10 +9,10 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef SECTIONING_H
-#define SECTIONING_H
+#ifndef SECTION_H
+#define SECTION_H
 
-#include "lyxfont.h"
+#include "LyXFont.h"
 
 #include <map>
 
diff --git a/src/Spacing.C b/src/Spacing.C
index 35eecde79e..d2ed1acd80 100644
--- a/src/Spacing.C
+++ b/src/Spacing.C
@@ -1,5 +1,5 @@
 /**
- * \file Spacing.C
+ * \file Spacing.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/SpellBase.C b/src/SpellBase.C
index e2935de163..8c878d8a06 100644
--- a/src/SpellBase.C
+++ b/src/SpellBase.C
@@ -1,5 +1,5 @@
 /**
- * \file SpellBase.C
+ * \file SpellBase.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/TextMetrics.C b/src/TextMetrics.C
index 834a229cbb..9a89e4899b 100644
--- a/src/TextMetrics.C
+++ b/src/TextMetrics.C
@@ -1,5 +1,5 @@
 /**
- * \file src/TextMetrics.C
+ * \file src/TextMetrics.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -19,22 +19,22 @@
 
 #include "TextMetrics.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
 #include "paragraph_funcs.h"
-#include "pariterator.h"
-#include "coordcache.h"
+#include "ParIterator.h"
+#include "CoordCache.h"
 #include "debug.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "FontIterator.h"
 #include "LColor.h"
-#include "lyxlength.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
-#include "metricsinfo.h"
+#include "LyXLength.h"
+#include "LyXRC.h"
+#include "LyXText.h"
+#include "MetricsInfo.h"
 #include "ParagraphParameters.h"
-#include "vspace.h"
+#include "VSpace.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
diff --git a/src/Thesaurus.C b/src/Thesaurus.C
index 12f7a029a9..14c82f61d3 100644
--- a/src/Thesaurus.C
+++ b/src/Thesaurus.C
@@ -1,5 +1,5 @@
 /**
- * \file Thesaurus.C
+ * \file Thesaurus.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/TocBackend.C b/src/TocBackend.C
index 04084ce27a..1b33dc0f7a 100644
--- a/src/TocBackend.C
+++ b/src/TocBackend.C
@@ -1,5 +1,5 @@
 /**
- * \file TocBackend.C
+ * \file TocBackend.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,12 +14,12 @@
 
 #include "TocBackend.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "FloatList.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "LyXAction.h"
-#include "paragraph.h"
+#include "Paragraph.h"
 #include "debug.h"
 
 #include "insets/InsetOptArg.h"
diff --git a/src/TocBackend.h b/src/TocBackend.h
index 62b872be3e..38d638ffed 100644
--- a/src/TocBackend.h
+++ b/src/TocBackend.h
@@ -20,7 +20,7 @@
 #include <vector>
 #include <string>
 
-#include "pariterator.h"
+#include "ParIterator.h"
 
 #include "support/docstream.h"
 
diff --git a/src/ToolbarBackend.C b/src/ToolbarBackend.C
index 0c339c4547..33084b396d 100644
--- a/src/ToolbarBackend.C
+++ b/src/ToolbarBackend.C
@@ -1,5 +1,5 @@
 /**
- * \file ToolbarBackend.C
+ * \file ToolbarBackend.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,8 +12,8 @@
 #include <config.h>
 
 #include "ToolbarBackend.h"
-#include "funcrequest.h"
-#include "lyxlex.h"
+#include "FuncRequest.h"
+#include "LyXLex.h"
 #include "debug.h"
 #include "gettext.h"
 #include "LyXAction.h"
diff --git a/src/ToolbarBackend.h b/src/ToolbarBackend.h
index ec9af8fea8..29c541e093 100644
--- a/src/ToolbarBackend.h
+++ b/src/ToolbarBackend.h
@@ -13,7 +13,7 @@
 #ifndef TOOLBAR_BACKEND_H
 #define TOOLBAR_BACKEND_H
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include <vector>
 
diff --git a/src/Variables.C b/src/Variables.C
index 3b3f6d4f9d..46e542a321 100644
--- a/src/Variables.C
+++ b/src/Variables.C
@@ -1,5 +1,5 @@
 /**
- * \file Variables.C
+ * \file Variables.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/aspell.C b/src/aspell.C
index 6925270404..cafa53b3d6 100644
--- a/src/aspell.C
+++ b/src/aspell.C
@@ -1,5 +1,5 @@
 /**
- * \file aspell.C
+ * \file ASpell.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,7 +15,7 @@
 
 #include <aspell.h>
 
-#include "aspell_local.h"
+#include "ASpell_local.h"
 #include "WordLangTuple.h"
 
 #include <boost/assert.hpp>
diff --git a/src/aspell_local.h b/src/aspell_local.h
index 250cd97b0d..22c7eac9cc 100644
--- a/src/aspell_local.h
+++ b/src/aspell_local.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file aspell_local.h
+ * \file ASpell_local.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/author.C b/src/author.C
index 5eba438318..2a74fe17d1 100644
--- a/src/author.C
+++ b/src/author.C
@@ -1,5 +1,5 @@
 /**
- * \file author.C
+ * \file Author.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "author.h"
+#include "Author.h"
 
 #include "support/lstrings.h"
 
diff --git a/src/author.h b/src/author.h
index 8830b470f0..dea4c10b34 100644
--- a/src/author.h
+++ b/src/author.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file author.h
+ * \file Author.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/boost.C b/src/boost.C
index 76e2fc4719..02fa09fc18 100644
--- a/src/boost.C
+++ b/src/boost.C
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "lyx_main.h"
+#include "LyX.h"
 #include "debug.h"
 #include "support/lyxlib.h"
 
diff --git a/src/box.C b/src/box.C
index aae0bf10ea..8094b45f39 100644
--- a/src/box.C
+++ b/src/box.C
@@ -1,5 +1,5 @@
 /**
- * \file box.C
+ * \file Box.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -8,11 +8,11 @@
  * Full author contact details are available in file CREDITS.
  */
 
-// Code moved out of line and out of box.h by Angus (7 Jan 2002)
+// Code moved out of line and out of Box.h by Angus (7 Jan 2002)
 
 #include <config.h>
 
-#include "box.h"
+#include "Box.h"
 
 #include "support/std_ostream.h"
 
diff --git a/src/box.h b/src/box.h
index adcb4958c4..7b9bb819bd 100644
--- a/src/box.h
+++ b/src/box.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file box.h
+ * \file Box.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/buffer.C b/src/buffer.C
index 5de13780df..af06cee735 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -1,5 +1,5 @@
 /**
- * \file buffer.C
+ * \file Buffer.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,44 +10,44 @@
 
 #include <config.h>
 
-#include "buffer.h"
+#include "Buffer.h"
 
-#include "author.h"
+#include "Author.h"
 #include "BranchList.h"
 #include "buffer_funcs.h"
-#include "bufferlist.h"
-#include "bufferparams.h"
-#include "counters.h"
+#include "BufferList.h"
+#include "BufferParams.h"
+#include "Counters.h"
 #include "Bullet.h"
 #include "Chktex.h"
 #include "debug.h"
-#include "encoding.h"
-#include "errorlist.h"
-#include "exporter.h"
-#include "format.h"
-#include "funcrequest.h"
+#include "Encoding.h"
+#include "ErrorList.h"
+#include "Exporter.h"
+#include "Format.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "insetiterator.h"
-#include "language.h"
+#include "InsetIterator.h"
+#include "Language.h"
 #include "LaTeX.h"
 #include "LaTeXFeatures.h"
 #include "LyXAction.h"
-#include "lyxlex.h"
-#include "lyxtext.h"
-#include "lyxrc.h"
-#include "lyxvc.h"
-#include "messages.h"
+#include "LyXLex.h"
+#include "LyXText.h"
+#include "LyXRC.h"
+#include "LyXVC.h"
+#include "Messages.h"
 #include "output.h"
 #include "output_docbook.h"
 #include "output_latex.h"
-#include "paragraph.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
-#include "pariterator.h"
+#include "ParIterator.h"
 #include "sgml.h"
-#include "texrow.h"
+#include "TexRow.h"
 #include "TocBackend.h"
-#include "undo.h"
+#include "Undo.h"
 #include "version.h"
 
 #include "insets/InsetBibitem.h"
diff --git a/src/buffer.h b/src/buffer.h
index 94694e2622..e3df4aa2b9 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file buffer.h
+ * \file Buffer.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,10 +12,10 @@
 #ifndef BUFFER_H
 #define BUFFER_H
 
-#include "errorlist.h"
+#include "ErrorList.h"
 #include "InsetList.h"
 
-#include "dociterator.h"
+#include "DocIterator.h"
 #include "ParagraphList_fwd.h"
 
 #include "support/filename.h"
diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C
index db543a018a..aa15b8963f 100644
--- a/src/buffer_funcs.C
+++ b/src/buffer_funcs.C
@@ -1,5 +1,5 @@
 /**
- * \file buffer_funcs.C
+ * \file buffer_funcs.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,27 +13,27 @@
 #include <config.h>
 
 #include "buffer_funcs.h"
-#include "buffer.h"
-#include "bufferlist.h"
-#include "bufferparams.h"
-#include "dociterator.h"
-#include "counters.h"
-#include "errorlist.h"
+#include "Buffer.h"
+#include "BufferList.h"
+#include "BufferParams.h"
+#include "DocIterator.h"
+#include "Counters.h"
+#include "ErrorList.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "gettext.h"
-#include "language.h"
+#include "Language.h"
 #include "LaTeX.h"
-#include "lyxtextclass.h"
-#include "paragraph.h"
+#include "LyXTextClass.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphList.h"
 #include "ParagraphParameters.h"
-#include "pariterator.h"
-#include "lyxvc.h"
-#include "texrow.h"
+#include "ParIterator.h"
+#include "LyXVC.h"
+#include "TexRow.h"
 #include "TocBackend.h"
-#include "vc-backend.h"
+#include "VCBackend.h"
 
 #include "frontends/Alert.h"
 
diff --git a/src/bufferlist.C b/src/bufferlist.C
index 11213b7254..810a5e4ac7 100644
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -1,5 +1,5 @@
 /**
- * \file bufferlist.C
+ * \file BufferList.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,18 +10,18 @@
 
 #include <config.h>
 
-#include "bufferlist.h"
+#include "BufferList.h"
 
-#include "author.h"
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Author.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "debug.h"
 #include "gettext.h"
-#include "session.h"
+#include "Session.h"
 #include "lyx_cb.h"
-#include "lyx_main.h"
+#include "LyX.h"
 #include "output_latex.h"
-#include "paragraph.h"
+#include "Paragraph.h"
 #include "ParagraphList.h"
 
 #include "frontends/Alert.h"
diff --git a/src/bufferlist.h b/src/bufferlist.h
index 350e5fc7da..cdba073c99 100644
--- a/src/bufferlist.h
+++ b/src/bufferlist.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file bufferlist.h
+ * \file BufferList.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -116,7 +116,7 @@ private:
 	void emergencyWrite(Buffer * buf);
 };
 
-/// Implementation is in lyx_main.C
+/// Implementation is in LyX.cpp
 extern BufferList & theBufferList();
 
 
diff --git a/src/bufferparams.C b/src/bufferparams.C
index 16e787321c..2fc2a5c79b 100644
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -1,5 +1,5 @@
 /**
- * \file bufferparams.C
+ * \file BufferParams.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,26 +15,26 @@
 
 #include <config.h>
 
-#include "bufferparams.h"
+#include "BufferParams.h"
 
-#include "author.h"
+#include "Author.h"
 #include "BranchList.h"
 #include "Bullet.h"
 #include "debug.h"
-#include "encoding.h"
+#include "Encoding.h"
 #include "gettext.h"
-#include "language.h"
+#include "Language.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"
-#include "lyxfont.h"
-#include "lyxlex.h"
-#include "lyxrc.h"
-#include "lyxtextclasslist.h"
-#include "outputparams.h"
+#include "LyXFont.h"
+#include "LyXLex.h"
+#include "LyXRC.h"
+#include "LyXTextClassList.h"
+#include "OutputParams.h"
 #include "tex-strings.h"
 #include "Spacing.h"
-#include "texrow.h"
-#include "vspace.h"
+#include "TexRow.h"
+#include "VSpace.h"
 
 #include "frontends/Alert.h"
 
diff --git a/src/bufferparams.h b/src/bufferparams.h
index 23e4ca9f9a..c147290058 100644
--- a/src/bufferparams.h
+++ b/src/bufferparams.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file bufferparams.h
+ * \file BufferParams.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,7 +15,7 @@
 #ifndef BUFFERPARAMS_H
 #define BUFFERPARAMS_H
 
-#include "lyxtextclass.h"
+#include "LyXTextClass.h"
 #include "paper.h"
 
 #include "insets/InsetQuotes.h"
diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index d0fa5b7d04..a5e104e7fc 100644
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -1,5 +1,5 @@
 /**
- * \file bufferview_funcs.C
+ * \file bufferview_funcs.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,20 +16,20 @@
 
 #include "bufferview_funcs.h"
 
-#include "author.h"
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Author.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
-#include "cursor.h"
-#include "coordcache.h"
+#include "LCursor.h"
+#include "CoordCache.h"
 #include "gettext.h"
-#include "language.h"
+#include "Language.h"
 #include "LColor.h"
-#include "lyxlex.h"
-#include "lyxrow.h"
-#include "paragraph.h"
+#include "LyXLex.h"
+#include "Row.h"
+#include "Paragraph.h"
 #include "ParagraphParameters.h"
-#include "pariterator.h"
+#include "ParIterator.h"
 
 #include "frontends/Alert.h"
 
diff --git a/src/changes.C b/src/changes.C
index 4c3ca6d977..a7cd525dde 100644
--- a/src/changes.C
+++ b/src/changes.C
@@ -1,5 +1,5 @@
 /**
- * \file changes.C
+ * \file Changes.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 
 #include <config.h>
 
-#include "changes.h"
+#include "Changes.h"
 #include "debug.h"
 
 #include <boost/assert.hpp>
diff --git a/src/changes.h b/src/changes.h
index 967a9a6c8d..b50c00e02c 100644
--- a/src/changes.h
+++ b/src/changes.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file changes.h
+ * \file Changes.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 420eea9caa..445717fb67 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -21,11 +21,11 @@ lyxclient_LDADD = \
 lyxclient_SOURCES = \
 	boost.cpp \
 	client.C \
-	debug.C \
+	debug.cpp \
 	debug.h \
-	gettext.C \
-	messages.C \
-	messages.h
+	gettext.cpp \
+	Messages.cpp \
+	Messages.h
 
 lyxclient.1:
 	cp -p $(srcdir)/lyxclient.man lyxclient.1
diff --git a/src/client/boost.C b/src/client/boost.C
index 73ce72766f..3cef1218cd 100644
--- a/src/client/boost.C
+++ b/src/client/boost.C
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "lyx_main.h"
+#include "LyX.h"
 #include "debug.h"
 #include "support/lyxlib.h"
 
diff --git a/src/client/debug.C b/src/client/debug.C
index a3e0920e98..fe998014cb 100644
--- a/src/client/debug.C
+++ b/src/client/debug.C
@@ -1,5 +1,5 @@
 /**
- * \file debug.C
+ * \file debug.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/client/gettext.C b/src/client/gettext.C
index 409b9271da..7eb0be01c1 100644
--- a/src/client/gettext.C
+++ b/src/client/gettext.C
@@ -1,5 +1,5 @@
 /**
- * \file src/gettext.C
+ * \file src/gettext.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "gettext.h"
-#include "messages.h"
+#include "Messages.h"
 
 
 namespace lyx {
diff --git a/src/client/messages.C b/src/client/messages.C
index cbec9e8363..04f1d496b2 100644
--- a/src/client/messages.C
+++ b/src/client/messages.C
@@ -1,4 +1,4 @@
-/* \file messages.C
+/* \file Messages.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,7 +9,7 @@
 
 #include <config.h>
 
-#include "messages.h"
+#include "Messages.h"
 #include "debug.h"
 #include "support/filetools.h"
 #include "support/package.h"
diff --git a/src/client/messages.h b/src/client/messages.h
index b91001d22e..5eb94476ea 100644
--- a/src/client/messages.h
+++ b/src/client/messages.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* \file messages.h
+/* \file Messages.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/converter.C b/src/converter.C
index 4fc2022eb4..02a5ba6d96 100644
--- a/src/converter.C
+++ b/src/converter.C
@@ -1,5 +1,5 @@
 /**
- * \file converter.C
+ * \file Converter.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,18 +10,18 @@
 
 #include <config.h>
 
-#include "converter.h"
+#include "Converter.h"
 
 #include "ConverterCache.h"
-#include "buffer.h"
+#include "Buffer.h"
 #include "buffer_funcs.h"
-#include "bufferparams.h"
+#include "BufferParams.h"
 #include "debug.h"
-#include "format.h"
+#include "Format.h"
 #include "gettext.h"
-#include "language.h"
+#include "Language.h"
 #include "LaTeX.h"
-#include "mover.h"
+#include "Mover.h"
 
 #include "frontends/Alert.h"
 
diff --git a/src/converter.h b/src/converter.h
index 6350fd5fdc..2849e877e4 100644
--- a/src/converter.h
+++ b/src/converter.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file converter.h
+ * \file Converter.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,8 +12,8 @@
 #ifndef CONVERTER_H
 #define CONVERTER_H
 
-#include "graph.h"
-#include "outputparams.h"
+#include "Graph.h"
+#include "OutputParams.h"
 
 #include <vector>
 #include <string>
@@ -162,11 +162,11 @@ private:
 };
 
 /// The global instance.
-/// Implementation is in lyx_main.C.
+/// Implementation is in LyX.cpp.
 extern Converters & theConverters();
 
 /// The global copy after reading lyxrc.defaults.
-/// Implementation is in lyx_main.C.
+/// Implementation is in LyX.cpp.
 extern Converters & theSystemConverters();
 
 } // namespace lyx
diff --git a/src/coordcache.C b/src/coordcache.C
index 6ded325de5..b837f17d47 100644
--- a/src/coordcache.C
+++ b/src/coordcache.C
@@ -1,4 +1,4 @@
-/* \file coordcache.C
+/* \file CoordCache.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,10 +9,10 @@
 
 #include <config.h>
 
-#include "coordcache.h"
+#include "CoordCache.h"
 #include "debug.h"
 
-#include "lyxtext.h"
+#include "LyXText.h"
 
 #include "insets/InsetBase.h"
 
diff --git a/src/coordcache.h b/src/coordcache.h
index dba9b89fd4..f3ecc18418 100644
--- a/src/coordcache.h
+++ b/src/coordcache.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* \file coordcache.h
+/* \file CoordCache.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/counters.C b/src/counters.C
index 72b052bd91..20654b7e8e 100644
--- a/src/counters.C
+++ b/src/counters.C
@@ -1,5 +1,5 @@
 /**
- * \file counters.C
+ * \file Counters.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 
 #include <config.h>
 
-#include "counters.h"
+#include "Counters.h"
 #include "debug.h"
 
 #include "support/lstrings.h"
diff --git a/src/counters.h b/src/counters.h
index cc13276771..f11cfefa0c 100644
--- a/src/counters.h
+++ b/src/counters.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file counters.h
+ * \file Counters.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/cursor.C b/src/cursor.C
index f74952606f..5138076e37 100644
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -1,5 +1,5 @@
 /**
- * \file cursor.C
+ * \file LCursor.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,24 +14,24 @@
 
 #include "BufferView.h"
 #include "bufferview_funcs.h"
-#include "buffer.h"
-#include "cursor.h"
-#include "coordcache.h"
+#include "Buffer.h"
+#include "LCursor.h"
+#include "CoordCache.h"
 #include "CutAndPaste.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "encoding.h"
-#include "funcrequest.h"
-#include "language.h"
+#include "DispatchResult.h"
+#include "Encoding.h"
+#include "FuncRequest.h"
+#include "Language.h"
 #include "lfuns.h"
-#include "lyxfont.h"
-#include "lyxfunc.h" // only for setMessage()
-#include "lyxrc.h"
-#include "lyxrow.h"
-#include "lyxtext.h"
-#include "paragraph.h"
+#include "LyXFont.h"
+#include "LyXFunc.h" // only for setMessage()
+#include "LyXRC.h"
+#include "Row.h"
+#include "LyXText.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
-#include "pariterator.h"
+#include "ParIterator.h"
 
 #include "insets/InsetTabular.h"
 #include "insets/InsetText.h"
diff --git a/src/cursor.h b/src/cursor.h
index 557ceae7e1..5636b26ed3 100644
--- a/src/cursor.h
+++ b/src/cursor.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file cursor.h
+ * \file LCursor.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,11 +9,11 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef CURSOR_H
-#define CURSOR_H
+#ifndef LCURSOR_H
+#define LCURSOR_H
 
-#include "dispatchresult.h"
-#include "dociterator.h"
+#include "DispatchResult.h"
+#include "DocIterator.h"
 
 #include <iosfwd>
 #include <vector>
@@ -313,4 +313,4 @@ public:
 
 } // namespace lyx
 
-#endif // LYXCURSOR_H
+#endif // LYXLCURSOR_H
diff --git a/src/cursor_slice.C b/src/cursor_slice.C
index 98633ac98e..840d4b1c32 100644
--- a/src/cursor_slice.C
+++ b/src/cursor_slice.C
@@ -1,5 +1,5 @@
 /**
- * \file cursor_slice.C
+ * \file CursorSlice.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,10 +13,10 @@
 
 #include <config.h>
 
-#include "cursor_slice.h"
+#include "CursorSlice.h"
 #include "debug.h"
-#include "lyxtext.h"
-#include "paragraph.h"
+#include "LyXText.h"
+#include "Paragraph.h"
 
 #include "mathed/InsetMath.h"
 #include "mathed/MathArray.h"
diff --git a/src/cursor_slice.h b/src/cursor_slice.h
index 8b7200038f..7102d588fe 100644
--- a/src/cursor_slice.h
+++ b/src/cursor_slice.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file cursor_slice.h
+ * \file CursorSlice.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/debug.C b/src/debug.C
index bbf67f0fe5..2e532fc7ec 100644
--- a/src/debug.C
+++ b/src/debug.C
@@ -1,5 +1,5 @@
 /**
- * \file debug.C
+ * \file debug.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/dimension.C b/src/dimension.C
index c9a51d37e4..311c653f07 100644
--- a/src/dimension.C
+++ b/src/dimension.C
@@ -1,5 +1,5 @@
 /**
- * \file dimension.C
+ * \file Dimension.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "dimension.h"
+#include "Dimension.h"
 
 namespace lyx {
 
diff --git a/src/dimension.h b/src/dimension.h
index 5dd32d3beb..eefd76419a 100644
--- a/src/dimension.h
+++ b/src/dimension.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file dimension.h
+ * \file Dimension.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/dispatchresult.h b/src/dispatchresult.h
index 7b53ec1c85..560fc0d1bc 100644
--- a/src/dispatchresult.h
+++ b/src/dispatchresult.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file dispatchresult.h
+ * \file DispatchResult.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/dociterator.C b/src/dociterator.C
index c032f63964..c2e2653d4a 100644
--- a/src/dociterator.C
+++ b/src/dociterator.C
@@ -1,5 +1,5 @@
 /**
- * \file dociterator.C
+ * \file DocIterator.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,11 +11,11 @@
 
 #include <config.h>
 
-#include "dociterator.h"
+#include "DocIterator.h"
 
 #include "debug.h"
-#include "lyxtext.h"
-#include "paragraph.h"
+#include "LyXText.h"
+#include "Paragraph.h"
 
 #include "mathed/MathArray.h"
 #include "mathed/InsetMath.h"
diff --git a/src/dociterator.h b/src/dociterator.h
index dbeaf0823a..01b16bbabe 100644
--- a/src/dociterator.h
+++ b/src/dociterator.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file dociterator.h
+ * \file DocIterator.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef DOCITERATOR_H
 #define DOCITERATOR_H
 
-#include "cursor_slice.h"
+#include "CursorSlice.h"
 
 #include <vector>
 #include <iosfwd>
diff --git a/src/encoding.C b/src/encoding.C
index 2bfb4a8a2f..f446284f09 100644
--- a/src/encoding.C
+++ b/src/encoding.C
@@ -1,5 +1,5 @@
 /**
- * \file encoding.C
+ * \file Encoding.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,12 +12,12 @@
 
 #include <config.h>
 
-#include "encoding.h"
+#include "Encoding.h"
 
 #include "debug.h"
 #include "LaTeXFeatures.h"
-#include "lyxlex.h"
-#include "lyxrc.h"
+#include "LyXLex.h"
+#include "LyXRC.h"
 
 #include "support/filename.h"
 #include "support/lstrings.h"
diff --git a/src/encoding.h b/src/encoding.h
index 61ee7c6811..6d10d3bf67 100644
--- a/src/encoding.h
+++ b/src/encoding.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file encoding.h
+ * \file Encoding.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/errorlist.C b/src/errorlist.C
index e3f19044b2..a9e1212203 100644
--- a/src/errorlist.C
+++ b/src/errorlist.C
@@ -1,5 +1,5 @@
 /**
- * \file errorlist.C
+ * \file ErrorList.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "errorlist.h"
+#include "ErrorList.h"
 
 
 namespace lyx {
diff --git a/src/errorlist.h b/src/errorlist.h
index 8c91c42e32..e58c47d0f0 100644
--- a/src/errorlist.h
+++ b/src/errorlist.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file errorlist.h
+ * \file ErrorList.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/exporter.C b/src/exporter.C
index 164a6da9d0..283a6db831 100644
--- a/src/exporter.C
+++ b/src/exporter.C
@@ -1,5 +1,5 @@
 /**
- * \file exporter.C
+ * \file Exporter.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,18 +16,18 @@
 
 #include <config.h>
 
-#include "exporter.h"
+#include "Exporter.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "buffer_funcs.h"
-#include "bufferparams.h"
-#include "converter.h"
-#include "format.h"
+#include "BufferParams.h"
+#include "Converter.h"
+#include "Format.h"
 #include "gettext.h"
-#include "lyxrc.h"
-#include "mover.h"
+#include "LyXRC.h"
+#include "Mover.h"
 #include "output_plaintext.h"
-#include "outputparams.h"
+#include "OutputParams.h"
 #include "frontends/Alert.h"
 
 #include "support/filetools.h"
diff --git a/src/exporter.h b/src/exporter.h
index 22c01ef6b9..29c06ea831 100644
--- a/src/exporter.h
+++ b/src/exporter.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file exporter.h
+ * \file Exporter.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/factory.C b/src/factory.C
index e9b32604ea..3e55b3fa84 100644
--- a/src/factory.C
+++ b/src/factory.C
@@ -1,5 +1,5 @@
 /**
- * \file factory.C
+ * \file factory.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,16 +12,16 @@
 
 #include "factory.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "BufferView.h"
-#include "bufferparams.h"
+#include "BufferParams.h"
 #include "debug.h"
 #include "FloatList.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "LColor.h"
-#include "lyxlex.h"
-#include "lyx_main.h"
-#include "paragraph.h"
+#include "LyXLex.h"
+#include "LyX.h"
+#include "Paragraph.h"
 
 #include "insets/InsetBibitem.h"
 #include "insets/InsetBibtex.h"
diff --git a/src/format.C b/src/format.C
index 5de348e181..c70c363fe0 100644
--- a/src/format.C
+++ b/src/format.C
@@ -1,5 +1,5 @@
 /**
- * \file format.C
+ * \file Format.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,13 +10,13 @@
 
 #include <config.h>
 
-#include "format.h"
-#include "buffer.h"
-#include "bufferparams.h"
-#include "lyxrc.h"
+#include "Format.h"
+#include "Buffer.h"
+#include "BufferParams.h"
+#include "LyXRC.h"
 #include "debug.h"
 #include "gettext.h"
-#include "lyxsocket.h"
+#include "LyXServerSocket.h"
 
 #include "frontends/Application.h"
 #include "frontends/Alert.h" //to be removed?
diff --git a/src/format.h b/src/format.h
index 9c5c32180f..67a7a92188 100644
--- a/src/format.h
+++ b/src/format.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file format.h
+ * \file Format.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/Alert.cpp b/src/frontends/Alert.cpp
index 4ac7f9a478..4822bd76dc 100644
--- a/src/frontends/Alert.cpp
+++ b/src/frontends/Alert.cpp
@@ -14,7 +14,7 @@
 #include "Alert_pimpl.h"
 
 #include "debug.h"
-#include "lyx_main.h" // for lyx::use_gui
+#include "LyX.h" // for lyx::use_gui
 
 using std::endl;
 using std::make_pair;
diff --git a/src/frontends/Application.cpp b/src/frontends/Application.cpp
index cd62f7982c..6126e20c5b 100644
--- a/src/frontends/Application.cpp
+++ b/src/frontends/Application.cpp
@@ -20,12 +20,12 @@
 #include "frontends/LyXView.h"
 #include "frontends/WorkArea.h"
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "lyx_main.h"  // for lyx::use_gui
-#include "lyxfont.h"
-#include "lyxfunc.h"
-#include "lyxrc.h"
+#include "LyX.h"  // for lyx::use_gui
+#include "LyXFont.h"
+#include "LyXFunc.h"
+#include "LyXRC.h"
 
 #include "support/lstrings.h"
 #include "support/os.h"
diff --git a/src/frontends/Dialogs.cpp b/src/frontends/Dialogs.cpp
index afd4665c84..05d0128dec 100644
--- a/src/frontends/Dialogs.cpp
+++ b/src/frontends/Dialogs.cpp
@@ -59,7 +59,7 @@ BugfixSignal<boost::signal<void(string const &, InsetBase*)> > hideSignal;
 void Dialogs::hide(string const & name, InsetBase* inset)
 {
 	// Don't send the signal if we are quitting, because on MSVC it is
-	// destructed before the cut stack in CutAndPaste.C, and this method
+	// destructed before the cut stack in CutAndPaste.cpp, and this method
 	// is called from some inset destructor if the cut stack is not empty
 	// on exit.
 	if (!quitting)
diff --git a/src/frontends/LyXView.cpp b/src/frontends/LyXView.cpp
index 6d6c9fcb30..89d49dcd4d 100644
--- a/src/frontends/LyXView.cpp
+++ b/src/frontends/LyXView.cpp
@@ -19,22 +19,22 @@
 #include "WorkArea.h"
 #include "Gui.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
 #include "bufferview_funcs.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "errorlist.h"
-#include "funcrequest.h"
+#include "ErrorList.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "intl.h"
+#include "Intl.h"
 #include "lyx_cb.h"
-#include "lyxfunc.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
+#include "LyXFunc.h"
+#include "LyXRC.h"
+#include "LyXText.h"
 #include "MenuBackend.h"
-#include "paragraph.h"
+#include "Paragraph.h"
 
 #include "controllers/ControlCommandBuffer.h"
 
diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h
index 0adb83f315..6e12df9b5d 100644
--- a/src/frontends/LyXView.h
+++ b/src/frontends/LyXView.h
@@ -16,7 +16,7 @@
 #include "frontends/Application.h"
 #include "frontends/Toolbars.h"
 
-#include "lyxfunc.h"
+#include "LyXFunc.h"
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/signal.hpp>
diff --git a/src/frontends/NoGuiFontMetrics.h b/src/frontends/NoGuiFontMetrics.h
index 28ab4f40a9..b989e6c1a9 100644
--- a/src/frontends/NoGuiFontMetrics.h
+++ b/src/frontends/NoGuiFontMetrics.h
@@ -14,7 +14,7 @@
 
 #include "frontends/FontMetrics.h"
 
-#include "dimension.h"
+#include "Dimension.h"
 
 #include "support/docstring.h"
 
diff --git a/src/frontends/Painter.cpp b/src/frontends/Painter.cpp
index 2cba549793..772eada114 100644
--- a/src/frontends/Painter.cpp
+++ b/src/frontends/Painter.cpp
@@ -16,7 +16,7 @@
 #include "frontends/FontMetrics.h"
 
 #include "LColor.h"
-#include "lyxfont.h"
+#include "LyXFont.h"
 
 using lyx::docstring;
 
diff --git a/src/frontends/Toolbars.cpp b/src/frontends/Toolbars.cpp
index fcf7e565c9..c424be9d05 100644
--- a/src/frontends/Toolbars.cpp
+++ b/src/frontends/Toolbars.cpp
@@ -13,16 +13,16 @@
 
 #include "Toolbars.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "debug.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
-#include "lyxfunc.h"
-#include "lyxtextclass.h"
+#include "LyXFunc.h"
+#include "LyXTextClass.h"
 #include "LyXView.h"
-#include "lyx_main.h"
+#include "LyX.h"
 
 
 namespace lyx {
diff --git a/src/frontends/Toolbars.h b/src/frontends/Toolbars.h
index 94c68a1527..3602224a86 100644
--- a/src/frontends/Toolbars.h
+++ b/src/frontends/Toolbars.h
@@ -26,7 +26,7 @@
 #include "ToolbarBackend.h"
 #include <boost/shared_ptr.hpp>
 #include <map>
-#include "session.h"
+#include "Session.h"
 
 
 namespace lyx {
diff --git a/src/frontends/WorkArea.cpp b/src/frontends/WorkArea.cpp
index d6d2c93a26..3aedb40fd2 100644
--- a/src/frontends/WorkArea.cpp
+++ b/src/frontends/WorkArea.cpp
@@ -18,25 +18,25 @@
 #include "frontends/Application.h"
 #include "frontends/FontMetrics.h"
 
-#include "funcrequest.h"
-#include "lyxfunc.h"
+#include "FuncRequest.h"
+#include "LyXFunc.h"
 #include "Painter.h"
 
 #include "BufferView.h"
-#include "buffer.h"
-#include "bufferparams.h"
-#include "coordcache.h"
-#include "cursor.h"
+#include "Buffer.h"
+#include "BufferParams.h"
+#include "CoordCache.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "language.h"
+#include "Language.h"
 #include "LColor.h"
-#include "lyxfont.h"
-#include "lyxrc.h"
-#include "lyxrow.h"
-#include "lyxtext.h"
+#include "LyXFont.h"
+#include "LyXRC.h"
+#include "Row.h"
+#include "LyXText.h"
 #include "LyXView.h"
-#include "metricsinfo.h"
-#include "paragraph.h"
+#include "MetricsInfo.h"
+#include "Paragraph.h"
 #include "rowpainter.h"
 
 #include "gettext.h"
diff --git a/src/frontends/controllers/ControlBibtex.cpp b/src/frontends/controllers/ControlBibtex.cpp
index 1d13cf3d60..63cb6bbe05 100644
--- a/src/frontends/controllers/ControlBibtex.cpp
+++ b/src/frontends/controllers/ControlBibtex.cpp
@@ -15,10 +15,10 @@
 #include "ControlBibtex.h"
 #include "frontend_helpers.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 
-#include "lyxrc.h"
+#include "LyXRC.h"
 #include "gettext.h"
 
 #include "support/filefilterlist.h"
diff --git a/src/frontends/controllers/ControlBox.cpp b/src/frontends/controllers/ControlBox.cpp
index afa06a3c0d..fd7a29905e 100644
--- a/src/frontends/controllers/ControlBox.cpp
+++ b/src/frontends/controllers/ControlBox.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "ControlBox.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "insets/InsetBox.h"
 #include "gettext.h"
 
diff --git a/src/frontends/controllers/ControlBranch.cpp b/src/frontends/controllers/ControlBranch.cpp
index 520ff2202c..e961723e1e 100644
--- a/src/frontends/controllers/ControlBranch.cpp
+++ b/src/frontends/controllers/ControlBranch.cpp
@@ -13,10 +13,10 @@
 
 #include "ControlBranch.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BranchList.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "insets/InsetBranch.h"
 
 
diff --git a/src/frontends/controllers/ControlChanges.cpp b/src/frontends/controllers/ControlChanges.cpp
index 59305ad341..01983c2eca 100644
--- a/src/frontends/controllers/ControlChanges.cpp
+++ b/src/frontends/controllers/ControlChanges.cpp
@@ -13,12 +13,12 @@
 
 #include "ControlChanges.h"
 
-#include "author.h"
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Author.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
-#include "changes.h"
-#include "funcrequest.h"
+#include "Changes.h"
+#include "FuncRequest.h"
 #include "lyxfind.h"
 
 #include "support/lyxtime.h"
diff --git a/src/frontends/controllers/ControlCharacter.cpp b/src/frontends/controllers/ControlCharacter.cpp
index 5bf1556307..76fe57ec07 100644
--- a/src/frontends/controllers/ControlCharacter.cpp
+++ b/src/frontends/controllers/ControlCharacter.cpp
@@ -13,11 +13,11 @@
 #include "ControlCharacter.h"
 #include "ButtonController.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "bufferview_funcs.h"
-#include "funcrequest.h"
-#include "language.h"
+#include "FuncRequest.h"
+#include "Language.h"
 #include "LColor.h"
 
 using lyx::bv_funcs::font2string;
diff --git a/src/frontends/controllers/ControlCitation.cpp b/src/frontends/controllers/ControlCitation.cpp
index be5ebf8404..8a3a7134ce 100644
--- a/src/frontends/controllers/ControlCitation.cpp
+++ b/src/frontends/controllers/ControlCitation.cpp
@@ -13,8 +13,8 @@
 
 #include "ControlCitation.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "debug.h" // temporary
 
 #include "support/lstrings.h"
diff --git a/src/frontends/controllers/ControlCommand.cpp b/src/frontends/controllers/ControlCommand.cpp
index 13cf85abe6..b77e3b2b5c 100644
--- a/src/frontends/controllers/ControlCommand.cpp
+++ b/src/frontends/controllers/ControlCommand.cpp
@@ -12,7 +12,7 @@
 
 #include "ControlCommand.h"
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "insets/InsetCommand.h"
 
 
diff --git a/src/frontends/controllers/ControlCommandBuffer.cpp b/src/frontends/controllers/ControlCommandBuffer.cpp
index 9631034693..a803785aa4 100644
--- a/src/frontends/controllers/ControlCommandBuffer.cpp
+++ b/src/frontends/controllers/ControlCommandBuffer.cpp
@@ -15,10 +15,10 @@
 #include "ControlCommandBuffer.h"
 
 #include "BufferView.h"
-#include "cursor.h"
-#include "lyxfunc.h"
+#include "LCursor.h"
+#include "LyXFunc.h"
 #include "LyXAction.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include "frontends/LyXView.h"
 
diff --git a/src/frontends/controllers/ControlDocument.cpp b/src/frontends/controllers/ControlDocument.cpp
index 70648a401a..c25b84809f 100644
--- a/src/frontends/controllers/ControlDocument.cpp
+++ b/src/frontends/controllers/ControlDocument.cpp
@@ -14,17 +14,17 @@
 #include "Kernel.h"
 
 #include "BranchList.h"
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
 #include "buffer_funcs.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "language.h"
+#include "Language.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"
-#include "outputparams.h"
-#include "lyxtextclasslist.h"
+#include "OutputParams.h"
+#include "LyXTextClassList.h"
 #include "tex-strings.h"
 
 // FIXME: those two headers are needed because of the
diff --git a/src/frontends/controllers/ControlERT.cpp b/src/frontends/controllers/ControlERT.cpp
index 52f1ea1dd0..48c92e1423 100644
--- a/src/frontends/controllers/ControlERT.cpp
+++ b/src/frontends/controllers/ControlERT.cpp
@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "ControlERT.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 
 using std::string;
diff --git a/src/frontends/controllers/ControlErrorList.cpp b/src/frontends/controllers/ControlErrorList.cpp
index c45631916a..8d239c75b6 100644
--- a/src/frontends/controllers/ControlErrorList.cpp
+++ b/src/frontends/controllers/ControlErrorList.cpp
@@ -11,13 +11,13 @@
 #include <config.h>
 
 #include "ControlErrorList.h"
-#include "buffer.h"
+#include "Buffer.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "gettext.h"
-#include "lyxtext.h"
-#include "paragraph.h"
-#include "pariterator.h"
+#include "LyXText.h"
+#include "Paragraph.h"
+#include "ParIterator.h"
 
 // FIXME: those two headers are needed because of the
 // WorkArea::redraw() call below.
diff --git a/src/frontends/controllers/ControlErrorList.h b/src/frontends/controllers/ControlErrorList.h
index a66e8bc640..3670ab6987 100644
--- a/src/frontends/controllers/ControlErrorList.h
+++ b/src/frontends/controllers/ControlErrorList.h
@@ -12,7 +12,7 @@
 #ifndef CONTROLERRORLIST_H
 #define CONTROLERRORLIST_H
 
-#include "errorlist.h"
+#include "ErrorList.h"
 #include "Dialog.h"
 
 namespace lyx {
diff --git a/src/frontends/controllers/ControlExternal.cpp b/src/frontends/controllers/ControlExternal.cpp
index 369a23e2b0..a1e55405a9 100644
--- a/src/frontends/controllers/ControlExternal.cpp
+++ b/src/frontends/controllers/ControlExternal.cpp
@@ -14,10 +14,10 @@
 
 #include "ControlExternal.h"
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "gettext.h"
 #include "frontend_helpers.h"
-#include "lyxrc.h"
+#include "LyXRC.h"
 
 #include "graphics/GraphicsCache.h"
 #include "graphics/GraphicsCacheItem.h"
diff --git a/src/frontends/controllers/ControlFloat.cpp b/src/frontends/controllers/ControlFloat.cpp
index cc3cc652f6..036b7c4540 100644
--- a/src/frontends/controllers/ControlFloat.cpp
+++ b/src/frontends/controllers/ControlFloat.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "ControlFloat.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "insets/InsetFloat.h"
 
 
diff --git a/src/frontends/controllers/ControlGraphics.cpp b/src/frontends/controllers/ControlGraphics.cpp
index b07a5e062e..adc261653b 100644
--- a/src/frontends/controllers/ControlGraphics.cpp
+++ b/src/frontends/controllers/ControlGraphics.cpp
@@ -15,9 +15,9 @@
 
 #include "frontend_helpers.h"
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "lyxrc.h"
+#include "LyXRC.h"
 
 #include "graphics/GraphicsCache.h"
 #include "graphics/GraphicsCacheItem.h"
diff --git a/src/frontends/controllers/ControlInclude.cpp b/src/frontends/controllers/ControlInclude.cpp
index 6677db2f84..96ba976f5c 100644
--- a/src/frontends/controllers/ControlInclude.cpp
+++ b/src/frontends/controllers/ControlInclude.cpp
@@ -16,11 +16,11 @@
 #include "frontend_helpers.h"
 #include "Kernel.h"
 
-#include "buffer.h"
-#include "format.h"
-#include "funcrequest.h"
+#include "Buffer.h"
+#include "Format.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "lyxrc.h"
+#include "LyXRC.h"
 
 #include "insets/InsetInclude.h"
 
diff --git a/src/frontends/controllers/ControlLog.cpp b/src/frontends/controllers/ControlLog.cpp
index ba1a5350bc..f8793a5da8 100644
--- a/src/frontends/controllers/ControlLog.cpp
+++ b/src/frontends/controllers/ControlLog.cpp
@@ -14,7 +14,7 @@
 #include "ControlLog.h"
 
 #include "gettext.h"
-#include "lyxlex.h"
+#include "LyXLex.h"
 
 #include <sstream>
 #include <fstream>
diff --git a/src/frontends/controllers/ControlMath.cpp b/src/frontends/controllers/ControlMath.cpp
index d30562c3ae..02f5f13626 100644
--- a/src/frontends/controllers/ControlMath.cpp
+++ b/src/frontends/controllers/ControlMath.cpp
@@ -12,7 +12,7 @@
 
 #include "ControlMath.h"
 #include "debug.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include "support/lyxalgo.h" // sorted
 #include "support/lstrings.h"
diff --git a/src/frontends/controllers/ControlMath.h b/src/frontends/controllers/ControlMath.h
index e1606fa03a..115614f38d 100644
--- a/src/frontends/controllers/ControlMath.h
+++ b/src/frontends/controllers/ControlMath.h
@@ -15,7 +15,7 @@
 
 #include "Dialog.h"
 #include "lfuns.h" // for kb_action
-#include "lyxfont.h"
+#include "LyXFont.h"
 
 #include <map>
 
diff --git a/src/frontends/controllers/ControlNote.cpp b/src/frontends/controllers/ControlNote.cpp
index c7969e00f6..fb264bee50 100644
--- a/src/frontends/controllers/ControlNote.cpp
+++ b/src/frontends/controllers/ControlNote.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "ControlNote.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "insets/InsetNote.h"
 #include "gettext.h"
 
diff --git a/src/frontends/controllers/ControlParagraph.cpp b/src/frontends/controllers/ControlParagraph.cpp
index 79c9bef56a..a768861b5f 100644
--- a/src/frontends/controllers/ControlParagraph.cpp
+++ b/src/frontends/controllers/ControlParagraph.cpp
@@ -13,9 +13,9 @@
 
 #include "ControlParagraph.h"
 #include "ButtonController.h"
-#include "funcrequest.h"
-#include "lyxlex.h"
-#include "paragraph.h"
+#include "FuncRequest.h"
+#include "LyXLex.h"
+#include "Paragraph.h"
 #include "ParagraphParameters.h"
 
 #include <sstream>
diff --git a/src/frontends/controllers/ControlPrefs.cpp b/src/frontends/controllers/ControlPrefs.cpp
index 73fb1920d4..eaefeb95e0 100644
--- a/src/frontends/controllers/ControlPrefs.cpp
+++ b/src/frontends/controllers/ControlPrefs.cpp
@@ -15,9 +15,9 @@
 #include "frontend_helpers.h"
 #include "Kernel.h"
 
-#include "bufferlist.h"
+#include "BufferList.h"
 #include "gettext.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "paper.h"
 #include "LColor.h"
 
diff --git a/src/frontends/controllers/ControlPrefs.h b/src/frontends/controllers/ControlPrefs.h
index c86af8c029..2deabd74f9 100644
--- a/src/frontends/controllers/ControlPrefs.h
+++ b/src/frontends/controllers/ControlPrefs.h
@@ -13,10 +13,10 @@
 #define CONTROLPREFS_H
 
 #include "Dialog.h"
-#include "converter.h"
-#include "format.h"
-#include "lyxrc.h"
-#include "mover.h"
+#include "Converter.h"
+#include "Format.h"
+#include "LyXRC.h"
+#include "Mover.h"
 
 #include <string>
 #include <vector>
diff --git a/src/frontends/controllers/ControlPrint.cpp b/src/frontends/controllers/ControlPrint.cpp
index a9ea05f75e..dad6f425a8 100644
--- a/src/frontends/controllers/ControlPrint.cpp
+++ b/src/frontends/controllers/ControlPrint.cpp
@@ -15,9 +15,9 @@
 #include "ButtonController.h"
 #include "frontend_helpers.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
-#include "funcrequest.h"
+#include "Buffer.h"
+#include "BufferParams.h"
+#include "FuncRequest.h"
 #include "gettext.h"
 #include "PrinterParams.h"
 
diff --git a/src/frontends/controllers/ControlRef.cpp b/src/frontends/controllers/ControlRef.cpp
index e0a886b072..dc7da17fc7 100644
--- a/src/frontends/controllers/ControlRef.cpp
+++ b/src/frontends/controllers/ControlRef.cpp
@@ -13,9 +13,9 @@
 
 #include "ControlRef.h"
 
-#include "buffer.h"
-#include "bufferlist.h"
-#include "funcrequest.h"
+#include "Buffer.h"
+#include "BufferList.h"
+#include "FuncRequest.h"
 
 #include "support/filetools.h" // MakeAbsPath, MakeDisplayPath
 
diff --git a/src/frontends/controllers/ControlSearch.cpp b/src/frontends/controllers/ControlSearch.cpp
index c70610967a..a9189c1415 100644
--- a/src/frontends/controllers/ControlSearch.cpp
+++ b/src/frontends/controllers/ControlSearch.cpp
@@ -12,7 +12,7 @@
 
 #include "ControlSearch.h"
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "lyxfind.h"
 
 namespace lyx {
diff --git a/src/frontends/controllers/ControlSendto.cpp b/src/frontends/controllers/ControlSendto.cpp
index 371b34a17e..a3c952767a 100644
--- a/src/frontends/controllers/ControlSendto.cpp
+++ b/src/frontends/controllers/ControlSendto.cpp
@@ -12,11 +12,11 @@
 
 #include "ControlSendto.h"
 
-#include "buffer.h"
-#include "converter.h"
-#include "format.h"
-#include "funcrequest.h"
-#include "lyxrc.h"
+#include "Buffer.h"
+#include "Converter.h"
+#include "Format.h"
+#include "FuncRequest.h"
+#include "LyXRC.h"
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
diff --git a/src/frontends/controllers/ControlSpellchecker.cpp b/src/frontends/controllers/ControlSpellchecker.cpp
index d6814ca102..0f8ff69d8c 100644
--- a/src/frontends/controllers/ControlSpellchecker.cpp
+++ b/src/frontends/controllers/ControlSpellchecker.cpp
@@ -12,25 +12,25 @@
 
 #include "ControlSpellchecker.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "CutAndPaste.h"
 #include "debug.h"
 #include "gettext.h"
-#include "language.h"
-#include "lyxrc.h"
-#include "paragraph.h"
+#include "Language.h"
+#include "LyXRC.h"
+#include "Paragraph.h"
 
 #if defined(USE_ASPELL)
-# include "aspell_local.h"
+# include "ASpell_local.h"
 #elif defined(USE_PSPELL)
-# include "pspell.h"
+# include "PSpell.h"
 #endif
 
 #if defined(USE_ISPELL)
-# include "ispell.h"
+# include "ISpell.h"
 #else
 # include "SpellBase.h"
 #endif
diff --git a/src/frontends/controllers/ControlTabular.cpp b/src/frontends/controllers/ControlTabular.cpp
index f4629ecff5..c3075a3b8e 100644
--- a/src/frontends/controllers/ControlTabular.cpp
+++ b/src/frontends/controllers/ControlTabular.cpp
@@ -12,10 +12,10 @@
 
 #include "BufferView.h"
 #include "ControlTabular.h"
-#include "cursor.h"
-#include "funcrequest.h"
-#include "lyxrc.h"
-#include "paragraph.h"
+#include "LCursor.h"
+#include "FuncRequest.h"
+#include "LyXRC.h"
+#include "Paragraph.h"
 #include "insets/InsetTabular.h"
 
 
diff --git a/src/frontends/controllers/ControlTabular.h b/src/frontends/controllers/ControlTabular.h
index 86c7f3fa1b..afb0b51d1b 100644
--- a/src/frontends/controllers/ControlTabular.h
+++ b/src/frontends/controllers/ControlTabular.h
@@ -17,7 +17,7 @@
 #define CONTROLTABULAR_H
 
 #include "Dialog.h"
-#include "tabular.h"
+#include "LyXTabular.h"
 
 namespace lyx {
 namespace frontend {
diff --git a/src/frontends/controllers/ControlTabularCreate.cpp b/src/frontends/controllers/ControlTabularCreate.cpp
index 0fb5d24bc4..0d8747b538 100644
--- a/src/frontends/controllers/ControlTabularCreate.cpp
+++ b/src/frontends/controllers/ControlTabularCreate.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "ControlTabularCreate.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include "support/convert.h"
 
diff --git a/src/frontends/controllers/ControlTexinfo.cpp b/src/frontends/controllers/ControlTexinfo.cpp
index 7694773600..c3d58a6293 100644
--- a/src/frontends/controllers/ControlTexinfo.cpp
+++ b/src/frontends/controllers/ControlTexinfo.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "ControlTexinfo.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include "support/filetools.h"
 
diff --git a/src/frontends/controllers/ControlThesaurus.cpp b/src/frontends/controllers/ControlThesaurus.cpp
index 79a0dcab1c..b2f706e5d2 100644
--- a/src/frontends/controllers/ControlThesaurus.cpp
+++ b/src/frontends/controllers/ControlThesaurus.cpp
@@ -13,7 +13,7 @@
 #include "ControlThesaurus.h"
 
 #include "lyxfind.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 using std::string;
 
diff --git a/src/frontends/controllers/ControlToc.cpp b/src/frontends/controllers/ControlToc.cpp
index 7e0014f872..26a808b88a 100644
--- a/src/frontends/controllers/ControlToc.cpp
+++ b/src/frontends/controllers/ControlToc.cpp
@@ -13,12 +13,12 @@
 
 #include "ControlToc.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "BufferView.h"
-#include "bufferparams.h"
+#include "BufferParams.h"
 #include "debug.h"
 #include "FloatList.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "gettext.h"
 
 #include "frontends/LyXView.h"
diff --git a/src/frontends/controllers/ControlVSpace.cpp b/src/frontends/controllers/ControlVSpace.cpp
index 8bd8db8751..1a43d1af07 100644
--- a/src/frontends/controllers/ControlVSpace.cpp
+++ b/src/frontends/controllers/ControlVSpace.cpp
@@ -14,7 +14,7 @@
 #include "ControlVSpace.h"
 #include "ButtonController.h"
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "insets/InsetVSpace.h"
 
 
diff --git a/src/frontends/controllers/ControlVSpace.h b/src/frontends/controllers/ControlVSpace.h
index a16ae52753..5dd5cf3165 100644
--- a/src/frontends/controllers/ControlVSpace.h
+++ b/src/frontends/controllers/ControlVSpace.h
@@ -14,7 +14,7 @@
 #define CONTROLVSPACE_H
 
 #include "Dialog.h"
-#include "vspace.h"
+#include "VSpace.h"
 
 namespace lyx {
 namespace frontend {
diff --git a/src/frontends/controllers/ControlViewSource.cpp b/src/frontends/controllers/ControlViewSource.cpp
index 0471cfa7d3..3db74c91f8 100644
--- a/src/frontends/controllers/ControlViewSource.cpp
+++ b/src/frontends/controllers/ControlViewSource.cpp
@@ -16,8 +16,8 @@
 #include "gettext.h"
 #include "support/types.h"
 #include "BufferView.h"
-#include "buffer.h"
-#include "cursor.h"
+#include "Buffer.h"
+#include "LCursor.h"
 #include <sstream>
 
 using std::string;
diff --git a/src/frontends/controllers/ControlWrap.cpp b/src/frontends/controllers/ControlWrap.cpp
index a297c08e9b..8efbb16b87 100644
--- a/src/frontends/controllers/ControlWrap.cpp
+++ b/src/frontends/controllers/ControlWrap.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "ControlWrap.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "insets/InsetWrap.h"
 
 
diff --git a/src/frontends/controllers/Dialog.cpp b/src/frontends/controllers/Dialog.cpp
index 3d8bf212d6..d8591586ee 100644
--- a/src/frontends/controllers/Dialog.cpp
+++ b/src/frontends/controllers/Dialog.cpp
@@ -17,9 +17,9 @@
 
 #include "frontends/LyXView.h"
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "lyxfunc.h"
+#include "LyXFunc.h"
 
 
 using std::string;
diff --git a/src/frontends/controllers/Kernel.cpp b/src/frontends/controllers/Kernel.cpp
index 235458c60b..f9b189ac11 100644
--- a/src/frontends/controllers/Kernel.cpp
+++ b/src/frontends/controllers/Kernel.cpp
@@ -12,10 +12,10 @@
 
 #include "Kernel.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "BufferView.h"
-#include "funcrequest.h"
-#include "lyxfunc.h"
+#include "FuncRequest.h"
+#include "LyXFunc.h"
 #include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
 
diff --git a/src/frontends/controllers/frontend_helpers.cpp b/src/frontends/controllers/frontend_helpers.cpp
index 382dcc4e03..55c51b1865 100644
--- a/src/frontends/controllers/frontend_helpers.cpp
+++ b/src/frontends/controllers/frontend_helpers.cpp
@@ -13,12 +13,12 @@
 
 #include "frontend_helpers.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "debug.h"
 #include "gettext.h"
-#include "language.h"
-#include "lyxlength.h"
+#include "Language.h"
+#include "LyXLength.h"
 
 #include <boost/regex.hpp>
 
diff --git a/src/frontends/controllers/frontend_helpers.h b/src/frontends/controllers/frontend_helpers.h
index 34375bfbf3..8a835bc1c4 100644
--- a/src/frontends/controllers/frontend_helpers.h
+++ b/src/frontends/controllers/frontend_helpers.h
@@ -13,7 +13,7 @@
 #ifndef FRONTEND_HELPERS_H
 #define FRONTEND_HELPERS_H
 
-#include "lyxfont.h"
+#include "LyXFont.h"
 #include "support/docstring.h"
 
 #include <utility>
diff --git a/src/frontends/qt4/Action.cpp b/src/frontends/qt4/Action.cpp
index 66d8dc413b..bbca50deb1 100644
--- a/src/frontends/qt4/Action.cpp
+++ b/src/frontends/qt4/Action.cpp
@@ -16,7 +16,7 @@
 #include "qt_helpers.h"
 
 #include "lyx_cb.h"
-#include "lyxfunc.h"
+#include "LyXFunc.h"
 #include "FuncStatus.h"
 #include "debug.h"
 
diff --git a/src/frontends/qt4/Action.h b/src/frontends/qt4/Action.h
index f40d7a3ee7..090ece3e4e 100644
--- a/src/frontends/qt4/Action.h
+++ b/src/frontends/qt4/Action.h
@@ -13,7 +13,7 @@
 #define ACTION_H
 
 #include "frontends/LyXView.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include "support/docstring.h"
 
diff --git a/src/frontends/qt4/ColorCache.cpp b/src/frontends/qt4/ColorCache.cpp
index 56994fd506..dca532b868 100644
--- a/src/frontends/qt4/ColorCache.cpp
+++ b/src/frontends/qt4/ColorCache.cpp
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "Color.h"
+#include "color.h"
 #include "ColorCache.h"
 
 #include "LColor.h"
diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index b8011a8811..1edff43975 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -27,12 +27,12 @@
 #include "support/package.h"
 
 #include "BufferView.h"
-#include "Color.h"
+#include "color.h"
 #include "debug.h"
-#include "funcrequest.h"
-#include "lyx_main.h"
-#include "lyxfunc.h"
-#include "lyxrc.h"
+#include "FuncRequest.h"
+#include "LyX.h"
+#include "LyXFunc.h"
+#include "LyXRC.h"
 
 #include <QApplication>
 #include <QClipboard>
diff --git a/src/frontends/qt4/GuiFontLoader.cpp b/src/frontends/qt4/GuiFontLoader.cpp
index f5cc8c9a5a..10a200792f 100644
--- a/src/frontends/qt4/GuiFontLoader.cpp
+++ b/src/frontends/qt4/GuiFontLoader.cpp
@@ -15,7 +15,7 @@
 #include "qt_helpers.h"
 
 #include "debug.h"
-#include "lyxrc.h"
+#include "LyXRC.h"
 
 #include "support/convert.h"
 #include "support/filetools.h"
diff --git a/src/frontends/qt4/GuiFontLoader.h b/src/frontends/qt4/GuiFontLoader.h
index e9b28d5813..842475afcb 100644
--- a/src/frontends/qt4/GuiFontLoader.h
+++ b/src/frontends/qt4/GuiFontLoader.h
@@ -16,8 +16,8 @@
 
 #include "GuiFontMetrics.h"
 
-#include "encoding.h"
-#include "lyxfont.h"
+#include "Encoding.h"
+#include "LyXFont.h"
 
 #include <QFont>
 
diff --git a/src/frontends/qt4/GuiFontMetrics.cpp b/src/frontends/qt4/GuiFontMetrics.cpp
index cf38d4d9c1..7737b944f9 100644
--- a/src/frontends/qt4/GuiFontMetrics.cpp
+++ b/src/frontends/qt4/GuiFontMetrics.cpp
@@ -15,8 +15,8 @@
 
 #include "qt_helpers.h"
 
-#include "language.h"
-#include "dimension.h"
+#include "Language.h"
+#include "Dimension.h"
 
 #include "support/unicode.h"
 
diff --git a/src/frontends/qt4/GuiImplementation.cpp b/src/frontends/qt4/GuiImplementation.cpp
index 18ae534f41..699bb8d599 100644
--- a/src/frontends/qt4/GuiImplementation.cpp
+++ b/src/frontends/qt4/GuiImplementation.cpp
@@ -20,9 +20,9 @@
 #include "GuiWorkArea.h"
 
 #include "BufferView.h"
-#include "bufferlist.h"
-#include "funcrequest.h"
-#include "lyxfunc.h"
+#include "BufferList.h"
+#include "FuncRequest.h"
+#include "LyXFunc.h"
 
 #include <QApplication>
 
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 113f1432cf..b28860bbc7 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -32,17 +32,17 @@
 #include "support/lstrings.h"
 
 #include "BufferView.h"
-#include "bufferlist.h"
+#include "BufferList.h"
 #include "debug.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "lyx_cb.h"
-#include "lyxrc.h"
-#include "lyx_main.h"
-#include "session.h"
-#include "lyxfunc.h"
+#include "LyXRC.h"
+#include "LyX.h"
+#include "Session.h"
+#include "LyXFunc.h"
 #include "MenuBackend.h"
-#include "buffer.h"
-#include "bufferlist.h"
+#include "Buffer.h"
+#include "BufferList.h"
 
 #include <QAction>
 #include <QApplication>
@@ -405,7 +405,7 @@ void GuiView::setGeometry(unsigned int width,
 	}
 	else
 	{
-		// FIXME: move this code into parse_geometry() (lyx_main.C)
+		// FIXME: move this code into parse_geometry() (LyX.cpp)
 #ifdef Q_WS_WIN
 		int x, y;
 		int w, h;
diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h
index dd1c2ca76d..57116664d4 100644
--- a/src/frontends/qt4/GuiView.h
+++ b/src/frontends/qt4/GuiView.h
@@ -19,7 +19,7 @@
 #include <config.h>
 
 #include "frontends/LyXView.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include <QMainWindow>
 #include <QTimer>
diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 436e7f1333..0b383c7bd6 100644
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -23,10 +23,10 @@
 #include "BufferView.h"
 #include "rowpainter.h"
 #include "debug.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "LColor.h"
 #include "version.h"
-#include "lyxrc.h"
+#include "LyXRC.h"
 
 #include "support/filetools.h" // LibFileSearch
 #include "support/os.h"
diff --git a/src/frontends/qt4/GuiWorkArea.h b/src/frontends/qt4/GuiWorkArea.h
index 73ca142697..67283d16d6 100644
--- a/src/frontends/qt4/GuiWorkArea.h
+++ b/src/frontends/qt4/GuiWorkArea.h
@@ -15,7 +15,7 @@
 
 #include "frontends/WorkArea.h"
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "frontends/Timeout.h"
 
 #include <QAbstractScrollArea>
diff --git a/src/frontends/qt4/InsertTableWidget.cpp b/src/frontends/qt4/InsertTableWidget.cpp
index de8a31768f..5b62b0266d 100644
--- a/src/frontends/qt4/InsertTableWidget.cpp
+++ b/src/frontends/qt4/InsertTableWidget.cpp
@@ -11,9 +11,9 @@
 
 #include <config.h>
 
-#include "lyxfunc.h"
+#include "LyXFunc.h"
 #include "FuncStatus.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "LyXView.h"
 
 #include "qt_helpers.h"
diff --git a/src/frontends/qt4/LengthCombo.h b/src/frontends/qt4/LengthCombo.h
index a0cebec003..345d2bdc18 100644
--- a/src/frontends/qt4/LengthCombo.h
+++ b/src/frontends/qt4/LengthCombo.h
@@ -14,7 +14,7 @@
 
 #include <QComboBox>
 
-#include "vspace.h"
+#include "VSpace.h"
 
 
 //namespace lyx {
diff --git a/src/frontends/qt4/QBibtex.cpp b/src/frontends/qt4/QBibtex.cpp
index 4d8ef8a8b8..8fa5eb9e4f 100644
--- a/src/frontends/qt4/QBibtex.cpp
+++ b/src/frontends/qt4/QBibtex.cpp
@@ -18,7 +18,7 @@
 #include "Qt2BC.h"
 #include "qt_helpers.h"
 #include "Validator.h"
-#include "lyxrc.h"
+#include "LyXRC.h"
 #include "CheckedLineEdit.h"
 
 #include "controllers/ControlBibtex.h"
diff --git a/src/frontends/qt4/QBox.cpp b/src/frontends/qt4/QBox.cpp
index d62c78e0df..f946716f40 100644
--- a/src/frontends/qt4/QBox.cpp
+++ b/src/frontends/qt4/QBox.cpp
@@ -19,7 +19,7 @@
 #include "qt_helpers.h"
 #include "Qt2BC.h"
 #include "lengthcommon.h"
-#include "lyxrc.h" // to set the default length values
+#include "LyXRC.h" // to set the default length values
 #include "Validator.h"
 
 #include "controllers/ControlBox.h"
diff --git a/src/frontends/qt4/QBranches.cpp b/src/frontends/qt4/QBranches.cpp
index 49a5682081..c777f6cfe5 100644
--- a/src/frontends/qt4/QBranches.cpp
+++ b/src/frontends/qt4/QBranches.cpp
@@ -17,7 +17,7 @@
 #include "Validator.h"
 #include "qt_helpers.h"
 
-#include "bufferparams.h"
+#include "BufferParams.h"
 #include "controllers/ControlDocument.h"
 
 #include "support/lstrings.h"
diff --git a/src/frontends/qt4/QDocument.cpp b/src/frontends/qt4/QDocument.cpp
index 6ef51d7de0..e66fe80d76 100644
--- a/src/frontends/qt4/QDocument.cpp
+++ b/src/frontends/qt4/QDocument.cpp
@@ -27,13 +27,13 @@
 // For latexHighlighter use in the preamble.
 #include "QViewSource.h"
 
-#include "bufferparams.h"
-#include "encoding.h"
+#include "BufferParams.h"
+#include "Encoding.h"
 #include "gettext.h"
 #include "frontend_helpers.h" // getSecond()
-#include "language.h"
-#include "lyxrc.h" // defaultUnit
-#include "lyxtextclasslist.h"
+#include "Language.h"
+#include "LyXRC.h" // defaultUnit
+#include "LyXTextClassList.h"
 #include "tex-strings.h" // tex_graphics
 #include "Spacing.h"
 
diff --git a/src/frontends/qt4/QExternal.cpp b/src/frontends/qt4/QExternal.cpp
index d33d91c6a6..27658816cd 100644
--- a/src/frontends/qt4/QExternal.cpp
+++ b/src/frontends/qt4/QExternal.cpp
@@ -14,7 +14,7 @@
 // Qt defines a macro 'signals' that clashes with a boost namespace.
 // All is well if the namespace is visible first.
 #include "lengthcommon.h"
-#include "lyxrc.h"
+#include "LyXRC.h"
 
 #include "controllers/ControlExternal.h"
 #include "controllers/ButtonController.h"
diff --git a/src/frontends/qt4/QGraphics.cpp b/src/frontends/qt4/QGraphics.cpp
index 5e1e100b61..86771c96b9 100644
--- a/src/frontends/qt4/QGraphics.cpp
+++ b/src/frontends/qt4/QGraphics.cpp
@@ -23,7 +23,7 @@
 #include "Validator.h"
 
 #include "lengthcommon.h"
-#include "lyxrc.h"
+#include "LyXRC.h"
 
 #include "controllers/ControlGraphics.h"
 #include "controllers/frontend_helpers.h"
diff --git a/src/frontends/qt4/QInclude.cpp b/src/frontends/qt4/QInclude.cpp
index a701814564..130fadce00 100644
--- a/src/frontends/qt4/QInclude.cpp
+++ b/src/frontends/qt4/QInclude.cpp
@@ -19,7 +19,7 @@
 #include "qt_helpers.h"
 #include "Validator.h"
 
-#include "lyxrc.h"
+#include "LyXRC.h"
 
 #include "controllers/ControlInclude.h"
 
diff --git a/src/frontends/qt4/QLImage.cpp b/src/frontends/qt4/QLImage.cpp
index 6a6c39cc0a..af3a30f19d 100644
--- a/src/frontends/qt4/QLImage.cpp
+++ b/src/frontends/qt4/QLImage.cpp
@@ -15,7 +15,7 @@
 #include "qt_helpers.h"
 
 #include "debug.h"
-#include "format.h"
+#include "Format.h"
 
 #include "graphics/GraphicsParams.h"
 
diff --git a/src/frontends/qt4/QLPainter.cpp b/src/frontends/qt4/QLPainter.cpp
index 8bec6aecec..91f9571a0f 100644
--- a/src/frontends/qt4/QLPainter.cpp
+++ b/src/frontends/qt4/QLPainter.cpp
@@ -23,7 +23,7 @@
 #include "qt_helpers.h"
 
 #include "debug.h"
-#include "language.h"
+#include "Language.h"
 #include "LColor.h"
 
 #include "support/unicode.h"
diff --git a/src/frontends/qt4/QLPopupMenu.h b/src/frontends/qt4/QLPopupMenu.h
index f397e4cd11..140adc0961 100644
--- a/src/frontends/qt4/QLPopupMenu.h
+++ b/src/frontends/qt4/QLPopupMenu.h
@@ -14,7 +14,7 @@
 
 #include <QMenu>
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "MenuBackend.h"
 
 namespace lyx {
diff --git a/src/frontends/qt4/QLToolbar.cpp b/src/frontends/qt4/QLToolbar.cpp
index 65af778356..e1e410d11f 100644
--- a/src/frontends/qt4/QLToolbar.cpp
+++ b/src/frontends/qt4/QLToolbar.cpp
@@ -14,13 +14,13 @@
 
 #include <config.h>
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "debug.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
-#include "lyxfunc.h"
+#include "LyXFunc.h"
 #include "IconPalette.h"
 
 #include "GuiView.h"
diff --git a/src/frontends/qt4/QLToolbar.h b/src/frontends/qt4/QLToolbar.h
index 5da713af17..eb7db6b520 100644
--- a/src/frontends/qt4/QLToolbar.h
+++ b/src/frontends/qt4/QLToolbar.h
@@ -21,7 +21,7 @@
 
 #include <QToolBar>
 #include <vector>
-#include "session.h"
+#include "Session.h"
 
 class QComboBox;
 
diff --git a/src/frontends/qt4/QLyXKeySym.cpp b/src/frontends/qt4/QLyXKeySym.cpp
index 524e1d14f6..3d61f9da73 100644
--- a/src/frontends/qt4/QLyXKeySym.cpp
+++ b/src/frontends/qt4/QLyXKeySym.cpp
@@ -28,8 +28,8 @@
 #include "support/environment.h"
 #include "support/unicode.h"
 
-#include "encoding.h"
-#include "language.h"
+#include "Encoding.h"
+#include "Language.h"
 
 
 namespace lyx {
diff --git a/src/frontends/qt4/QPrefs.cpp b/src/frontends/qt4/QPrefs.cpp
index b43678268c..50879fdc83 100644
--- a/src/frontends/qt4/QPrefs.cpp
+++ b/src/frontends/qt4/QPrefs.cpp
@@ -16,10 +16,10 @@
 #include "qt_helpers.h"
 #include "GuiApplication.h"
 
-#include "session.h"
+#include "Session.h"
 #include "debug.h"
 #include "LColor.h"
-#include "lyxfont.h"
+#include "LyXFont.h"
 #include "PanelStack.h"
 #include "QFontExample.h"
 #include "gettext.h"
diff --git a/src/frontends/qt4/QPrefs.h b/src/frontends/qt4/QPrefs.h
index a71d5ceaf9..126ca986aa 100644
--- a/src/frontends/qt4/QPrefs.h
+++ b/src/frontends/qt4/QPrefs.h
@@ -15,7 +15,7 @@
 #include "QDialogView.h"
 
 #include "LColor.h"
-#include "lyxrc.h"
+#include "LyXRC.h"
 
 #include "ui/PrefsUi.h"
 
diff --git a/src/frontends/qt4/QSendto.cpp b/src/frontends/qt4/QSendto.cpp
index 4efe0e32ae..290ebe965f 100644
--- a/src/frontends/qt4/QSendto.cpp
+++ b/src/frontends/qt4/QSendto.cpp
@@ -14,7 +14,7 @@
 #include "Qt2BC.h"
 #include "qt_helpers.h"
 
-#include "format.h"
+#include "Format.h"
 
 #include "controllers/ControlSendto.h"
 
diff --git a/src/frontends/qt4/QVSpace.cpp b/src/frontends/qt4/QVSpace.cpp
index 72fa302930..e7d0c48931 100644
--- a/src/frontends/qt4/QVSpace.cpp
+++ b/src/frontends/qt4/QVSpace.cpp
@@ -23,9 +23,9 @@
 #include "qt_helpers.h"
 #include "Validator.h"
 
-#include "lyxrc.h" // to set the default length values
+#include "LyXRC.h" // to set the default length values
 #include "Spacing.h"
-#include "vspace.h"
+#include "VSpace.h"
 
 #include "controllers/ControlVSpace.h"
 #include "controllers/frontend_helpers.h"
diff --git a/src/frontends/qt4/Validator.cpp b/src/frontends/qt4/Validator.cpp
index 262574d5b4..a8bdf34f1b 100644
--- a/src/frontends/qt4/Validator.cpp
+++ b/src/frontends/qt4/Validator.cpp
@@ -16,7 +16,7 @@
 #include "qt_helpers.h"
 
 #include "gettext.h"
-#include "lyxrc.h"
+#include "LyXRC.h"
 
 #include "frontends/Alert.h"
 
diff --git a/src/frontends/qt4/Validator.h b/src/frontends/qt4/Validator.h
index 686dd06fec..f4da36bd9f 100644
--- a/src/frontends/qt4/Validator.h
+++ b/src/frontends/qt4/Validator.h
@@ -25,8 +25,8 @@
 #ifndef VALIDATOR_H
 #define VALIDATOR_H
 
-#include "lyxlength.h"
-#include "lyxgluelength.h"
+#include "LyXLength.h"
+#include "LyXGlueLength.h"
 
 #include <QValidator>
 
diff --git a/src/frontends/qt4/qt_helpers.h b/src/frontends/qt4/qt_helpers.h
index 9dd1a2b340..8f0e811105 100644
--- a/src/frontends/qt4/qt_helpers.h
+++ b/src/frontends/qt4/qt_helpers.h
@@ -13,7 +13,7 @@
 #ifndef QTHELPERS_H
 #define QTHELPERS_H
 
-#include "lyxlength.h"
+#include "LyXLength.h"
 #include "support/docstring.h"
 #include "support/qstring_helpers.h"
 
diff --git a/src/funcrequest.C b/src/funcrequest.C
index 156da5c8f3..d853ada38e 100644
--- a/src/funcrequest.C
+++ b/src/funcrequest.C
@@ -1,5 +1,5 @@
 /**
- * \file funcrequest.C
+ * \file FuncRequest.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include <iostream>
 #include <sstream>
diff --git a/src/funcrequest.h b/src/funcrequest.h
index 118e4f45bf..e5c7afadad 100644
--- a/src/funcrequest.h
+++ b/src/funcrequest.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file funcrequest.h
+ * \file FuncRequest.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/gettext.C b/src/gettext.C
index 46053cfc59..e7b1650736 100644
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -1,5 +1,5 @@
 /**
- * \file src/gettext.C
+ * \file src/gettext.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "gettext.h"
-#include "messages.h"
+#include "Messages.h"
 
 #include "support/environment.h"
 #include "support/lstrings.h"
diff --git a/src/graph.C b/src/graph.C
index 9353327432..72b738450f 100644
--- a/src/graph.C
+++ b/src/graph.C
@@ -1,5 +1,5 @@
 /**
- * \file graph.C
+ * \file Graph.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "graph.h"
-#include "format.h"
+#include "Graph.h"
+#include "Format.h"
 
 #include <algorithm>
 
diff --git a/src/graph.h b/src/graph.h
index 718da2b694..f2296b85a9 100644
--- a/src/graph.h
+++ b/src/graph.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file graph.h
+ * \file Graph.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/graphics/GraphicsCacheItem.cpp b/src/graphics/GraphicsCacheItem.cpp
index 74e9eb4127..565be61f2f 100644
--- a/src/graphics/GraphicsCacheItem.cpp
+++ b/src/graphics/GraphicsCacheItem.cpp
@@ -18,7 +18,7 @@
 
 #include "ConverterCache.h"
 #include "debug.h"
-#include "format.h"
+#include "Format.h"
 
 #include "support/filetools.h"
 #include "support/FileMonitor.h"
diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp
index 3a69da9bdc..4d65067d8c 100644
--- a/src/graphics/GraphicsConverter.cpp
+++ b/src/graphics/GraphicsConverter.cpp
@@ -12,9 +12,9 @@
 
 #include "GraphicsConverter.h"
 
-#include "converter.h"
+#include "Converter.h"
 #include "debug.h"
-#include "format.h"
+#include "Format.h"
 
 #include "support/filetools.h"
 #include "support/forkedcallqueue.h"
diff --git a/src/graphics/GraphicsParams.cpp b/src/graphics/GraphicsParams.cpp
index d13dc1800f..ce23f0b5c5 100644
--- a/src/graphics/GraphicsParams.cpp
+++ b/src/graphics/GraphicsParams.cpp
@@ -12,7 +12,7 @@
 
 #include "GraphicsParams.h"
 
-#include "lyxlength.h"
+#include "LyXLength.h"
 
 #include <sstream>
 
diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index 4c32c76928..622d5289a2 100644
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -14,15 +14,15 @@
 #include "PreviewImage.h"
 #include "GraphicsCache.h"
 
-#include "buffer.h"
-#include "converter.h"
+#include "Buffer.h"
+#include "Converter.h"
 #include "debug.h"
-#include "format.h"
-#include "insetiterator.h"
+#include "Format.h"
+#include "InsetIterator.h"
 #include "LColor.h"
-#include "lyxrc.h"
-#include "outputparams.h"
-#include "paragraph.h"
+#include "LyXRC.h"
+#include "OutputParams.h"
+#include "Paragraph.h"
 
 #include "frontends/Application.h" // hexName
 
diff --git a/src/graphics/Previews.cpp b/src/graphics/Previews.cpp
index 0da83d901c..935f65f65f 100644
--- a/src/graphics/Previews.cpp
+++ b/src/graphics/Previews.cpp
@@ -13,10 +13,10 @@
 #include "Previews.h"
 #include "PreviewLoader.h"
 
-#include "buffer.h"
-#include "insetiterator.h"
-#include "lyxrc.h"
-#include "paragraph.h"
+#include "Buffer.h"
+#include "InsetIterator.h"
+#include "LyXRC.h"
+#include "Paragraph.h"
 
 #include "insets/Inset.h"
 
diff --git a/src/importer.C b/src/importer.C
index 6b27af5191..63c92a4a28 100644
--- a/src/importer.C
+++ b/src/importer.C
@@ -1,5 +1,5 @@
 /**
- * \file importer.C
+ * \file Importer.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,11 +12,11 @@
 
 #include <config.h>
 
-#include "importer.h"
-#include "converter.h"
-#include "format.h"
+#include "Importer.h"
+#include "Converter.h"
+#include "Format.h"
 #include "frontends/LyXView.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "lyx_cb.h"
 
 #include "support/filetools.h"
diff --git a/src/importer.h b/src/importer.h
index 634059d5f0..c5790841ee 100644
--- a/src/importer.h
+++ b/src/importer.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file importer.h
+ * \file Importer.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/insetiterator.C b/src/insetiterator.C
index 5f862fb3e2..4277d4fae7 100644
--- a/src/insetiterator.C
+++ b/src/insetiterator.C
@@ -1,5 +1,5 @@
 /**
- * \file insetiterator.C
+ * \file InsetIterator.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include "insetiterator.h"
+#include "InsetIterator.h"
 
 #include <boost/assert.hpp>
 
diff --git a/src/insetiterator.h b/src/insetiterator.h
index f48a760aa2..9f0bbd82cb 100644
--- a/src/insetiterator.h
+++ b/src/insetiterator.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file insetiterator.h
+ * \file InsetIterator.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef INSETITERATOR_H
 #define INSETITERATOR_H
 
-#include "dociterator.h"
+#include "DocIterator.h"
 
 
 namespace lyx {
diff --git a/src/insets/ExternalSupport.C b/src/insets/ExternalSupport.C
index 83077029d6..bedce87ac2 100644
--- a/src/insets/ExternalSupport.C
+++ b/src/insets/ExternalSupport.C
@@ -16,12 +16,12 @@
 #include "ExternalTransforms.h"
 #include "InsetExternal.h"
 
-#include "buffer.h"
-#include "converter.h"
+#include "Buffer.h"
+#include "Converter.h"
 #include "debug.h"
-#include "exporter.h"
-#include "format.h"
-#include "mover.h"
+#include "Exporter.h"
+#include "Format.h"
+#include "Mover.h"
 
 #include "support/filetools.h"
 #include "support/forkedcall.h"
diff --git a/src/insets/ExternalTemplate.C b/src/insets/ExternalTemplate.C
index 947e488a9d..708591e4b5 100644
--- a/src/insets/ExternalTemplate.C
+++ b/src/insets/ExternalTemplate.C
@@ -14,7 +14,7 @@
 #include "ExternalTemplate.h"
 
 #include "debug.h"
-#include "lyxlex.h"
+#include "LyXLex.h"
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
diff --git a/src/insets/ExternalTransforms.h b/src/insets/ExternalTransforms.h
index e650d292a8..296267d8b1 100644
--- a/src/insets/ExternalTransforms.h
+++ b/src/insets/ExternalTransforms.h
@@ -12,7 +12,7 @@
 #ifndef EXTERNALTRANSFORMS_H
 #define EXTERNALTRANSFORMS_H
 
-#include "lyxlength.h"
+#include "LyXLength.h"
 
 #include "graphics/GraphicsParams.h"
 
diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp
index 90f38b2647..3596150b90 100644
--- a/src/insets/Inset.cpp
+++ b/src/insets/Inset.cpp
@@ -18,9 +18,9 @@
 #include "BufferView.h"
 #include "debug.h"
 #include "gettext.h"
-#include "lyxtext.h"
-#include "metricsinfo.h"
-#include "coordcache.h"
+#include "LyXText.h"
+#include "MetricsInfo.h"
+#include "CoordCache.h"
 
 
 namespace lyx {
diff --git a/src/insets/InsetBase.cpp b/src/insets/InsetBase.cpp
index 8bc297ccdc..5f94edbaaa 100644
--- a/src/insets/InsetBase.cpp
+++ b/src/insets/InsetBase.cpp
@@ -12,19 +12,19 @@
 
 #include "InsetBase.h"
 
-#include "buffer.h"
-#include "coordcache.h"
+#include "Buffer.h"
+#include "CoordCache.h"
 #include "BufferView.h"
 #include "LColor.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "dimension.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "Dimension.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
-#include "lyxtext.h"
-#include "metricsinfo.h"
+#include "LyXText.h"
+#include "MetricsInfo.h"
 
 #include "frontends/Painter.h"
 
diff --git a/src/insets/InsetBase.h b/src/insets/InsetBase.h
index 6a88a728b3..5347cb1b7e 100644
--- a/src/insets/InsetBase.h
+++ b/src/insets/InsetBase.h
@@ -12,8 +12,8 @@
 #ifndef INSETBASE_H
 #define INSETBASE_H
 
-#include "changes.h"
-#include "dimension.h"
+#include "Changes.h"
+#include "Dimension.h"
 
 #include "support/docstream.h"
 
@@ -136,7 +136,7 @@ public:
 	virtual void setPosCache(PainterInfo const &, int, int) const {}
 	/// do we cover screen position x/y?
 	virtual bool covers(BufferView const & bv, int x, int y) const;
-	/// get the screen positions of the cursor (see note in cursor.C)
+	/// get the screen positions of the cursor (see note in LCursor.cpp)
 	virtual void cursorPos(BufferView const & bv,
 		CursorSlice const & sl, bool boundary, int & x, int & y) const;
 
diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index bab36181fb..de2828a859 100644
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -12,13 +12,13 @@
 
 #include "InsetBibitem.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "BufferView.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
-#include "lyxfont.h"
-#include "lyxlex.h"
-#include "paragraph.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
+#include "LyXFont.h"
+#include "LyXLex.h"
+#include "Paragraph.h"
 #include "ParagraphList.h"
 
 #include "support/lstrings.h"
diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 3eb2b99414..350320b766 100644
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -12,16 +12,16 @@
 
 #include "InsetBibtex.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
-#include "dispatchresult.h"
+#include "Buffer.h"
+#include "BufferParams.h"
+#include "DispatchResult.h"
 #include "debug.h"
-#include "encoding.h"
-#include "funcrequest.h"
+#include "Encoding.h"
+#include "FuncRequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "metricsinfo.h"
-#include "outputparams.h"
+#include "MetricsInfo.h"
+#include "OutputParams.h"
 
 #include "frontends/Alert.h"
 
diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index eae86d0440..755da26e41 100644
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -15,17 +15,17 @@
 #include "InsetBox.h"
 
 #include "BufferView.h"
-#include "cursor.h"
-#include "dispatchresult.h"
+#include "LCursor.h"
+#include "DispatchResult.h"
 #include "debug.h"
 #include "FuncStatus.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"
-#include "lyxlex.h"
-#include "metricsinfo.h"
-#include "paragraph.h"
+#include "LyXLex.h"
+#include "MetricsInfo.h"
+#include "Paragraph.h"
 #include "TextMetrics.h"
 
 #include "support/translator.h"
diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index 70b15215f7..5c10dfad77 100644
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -14,7 +14,7 @@
 #define INSETBOX_H
 
 #include "InsetCollapsable.h"
-#include "lyxlength.h"
+#include "LyXLength.h"
 #include "MailInset.h"
 
 
diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 2f75ae312d..05995019c0 100644
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -12,18 +12,18 @@
 
 #include "InsetBranch.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BranchList.h"
-#include "cursor.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "LCursor.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "LColor.h"
-#include "lyxlex.h"
-#include "paragraph.h"
-#include "outputparams.h"
+#include "LyXLex.h"
+#include "Paragraph.h"
+#include "OutputParams.h"
 
 #include <sstream>
 
diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index e719e9cbc2..6f4b78ad30 100644
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -14,21 +14,21 @@
 #include "InsetFloat.h"
 #include "InsetWrap.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
-#include "counters.h"
-#include "cursor.h"
+#include "Buffer.h"
+#include "BufferParams.h"
+#include "Counters.h"
+#include "LCursor.h"
 #include "BufferView.h"
 #include "Floating.h"
 #include "FloatList.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "LColor.h"
-#include "metricsinfo.h"
+#include "MetricsInfo.h"
 #include "output_latex.h"
-#include "outputparams.h"
-#include "paragraph.h"
+#include "OutputParams.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "TocBackend.h"
 
@@ -158,7 +158,7 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
 	// the text inset or the paragraph?
 	// We should also draw the float number (Lgb)
 
-	// Answer: the text inset (in buffer_funcs.C: setCaption).
+	// Answer: the text inset (in buffer_funcs.cpp: setCaption).
 
 	labelwidth_ = pi.pain.text(x, y, full_label_, pi.base.font);
 	// add some space to separate the label from the inset text
diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index 5b40c44133..eb8dfa2706 100644
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -13,7 +13,7 @@
 #define INSETCAPTION_H
 
 #include "InsetText.h"
-#include "lyxtextclass.h"
+#include "LyXTextClass.h"
 
 
 namespace lyx {
diff --git a/src/insets/InsetCharStyle.cpp b/src/insets/InsetCharStyle.cpp
index d8eb17baa5..95a751548e 100644
--- a/src/insets/InsetCharStyle.cpp
+++ b/src/insets/InsetCharStyle.cpp
@@ -14,20 +14,20 @@
 
 #include "InsetCharStyle.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"
-#include "lyxlex.h"
-#include "lyxtext.h"
-#include "metricsinfo.h"
-#include "paragraph.h"
+#include "LyXLex.h"
+#include "LyXText.h"
+#include "MetricsInfo.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "sgml.h"
 
diff --git a/src/insets/InsetCharStyle.h b/src/insets/InsetCharStyle.h
index 1bd423cf03..ff81304b7a 100644
--- a/src/insets/InsetCharStyle.h
+++ b/src/insets/InsetCharStyle.h
@@ -14,7 +14,7 @@
 #define INSETCHARSTYLE_H
 
 #include "InsetCollapsable.h"
-#include "lyxtextclass.h"
+#include "LyXTextClass.h"
 
 
 namespace lyx {
diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index c236ae4a46..e1a727c4c4 100644
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -13,11 +13,11 @@
 
 #include "InsetCitation.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "LaTeXFeatures.h"
 
 #include "frontends/controllers/frontend_helpers.h"
diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index ef68f6847e..2b7593c22a 100644
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -14,20 +14,20 @@
 
 #include "InsetCollapsable.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "dispatchresult.h"
+#include "DispatchResult.h"
 #include "FloatList.h"
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "LColor.h"
-#include "lyxlex.h"
-#include "funcrequest.h"
-#include "metricsinfo.h"
-#include "paragraph.h"
+#include "LyXLex.h"
+#include "FuncRequest.h"
+#include "MetricsInfo.h"
+#include "Paragraph.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index d0fcb46df0..7fc223952f 100644
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -17,8 +17,8 @@
 #include "Inset.h"
 #include "InsetText.h"
 
-#include "box.h"
-#include "lyxfont.h"
+#include "Box.h"
+#include "LyXFont.h"
 
 #include <string>
 
diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index d3676497d9..d96103a311 100644
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -14,12 +14,12 @@
 #include "InsetCommand.h"
 
 #include "BufferView.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
-#include "lyxlex.h"
-#include "metricsinfo.h"
+#include "LyXLex.h"
+#include "MetricsInfo.h"
 
 #include <sstream>
 
diff --git a/src/insets/InsetCommand.h b/src/insets/InsetCommand.h
index c849e0285e..b60e1d059d 100644
--- a/src/insets/InsetCommand.h
+++ b/src/insets/InsetCommand.h
@@ -17,7 +17,7 @@
 #include "InsetCommandParams.h"
 #include "RenderButton.h"
 #include "MailInset.h"
-#include "cursor.h"
+#include "LCursor.h"
 
 
 namespace lyx {
diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp
index d246d62bca..34563a9969 100644
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -15,7 +15,7 @@
 
 #include "debug.h"
 #include "gettext.h"
-#include "lyxlex.h"
+#include "LyXLex.h"
 
 #include "support/ExceptionMessage.h"
 #include "support/lstrings.h"
@@ -68,7 +68,7 @@ InsetCommandParams::findInfo(std::string const & name)
 
 	// InsetCitation
 	// FIXME: Use is_possible_cite_command() in
-	// src/frontends/controllers/frontend_helpers.cpp, see comment in src/factory.C.
+	// src/frontends/controllers/frontend_helpers.cpp, see comment in src/factory.cpp.
 	if (name == "cite" || name == "citet" || name == "citep" || name == "citealt" ||
 	    name == "citealp" || name == "citeauthor" || name == "citeyear" ||
 	    name == "citeyearpar" || name == "citet*" || name == "citep*" ||
diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index d87fdc77e8..5a078fdbb1 100644
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -13,23 +13,23 @@
 
 #include "InsetERT.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
-#include "language.h"
+#include "Language.h"
 #include "LColor.h"
 #include "LyXAction.h"
-#include "lyxlex.h"
-#include "lyxtextclass.h"
-#include "metricsinfo.h"
+#include "LyXLex.h"
+#include "LyXTextClass.h"
+#include "MetricsInfo.h"
 #include "ParagraphParameters.h"
-#include "paragraph.h"
+#include "Paragraph.h"
 
 #include "frontends/Alert.h"
 
diff --git a/src/insets/InsetEnv.cpp b/src/insets/InsetEnv.cpp
index 336090a1fc..623a3646e2 100644
--- a/src/insets/InsetEnv.cpp
+++ b/src/insets/InsetEnv.cpp
@@ -12,12 +12,12 @@
 
 #include "InsetEnv.h"
 
-#include "bufferparams.h"
+#include "BufferParams.h"
 #include "gettext.h"
-#include "paragraph.h"
-#include "outputparams.h"
+#include "Paragraph.h"
+#include "OutputParams.h"
 #include "output_latex.h"
-#include "texrow.h"
+#include "TexRow.h"
 
 
 namespace lyx {
diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp
index f2be434e9b..eb78e97a54 100644
--- a/src/insets/InsetExternal.cpp
+++ b/src/insets/InsetExternal.cpp
@@ -17,20 +17,20 @@
 #include "insets/RenderGraphic.h"
 #include "insets/RenderPreview.h"
 
-#include "buffer.h"
-#include "cursor.h"
+#include "Buffer.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "exporter.h"
+#include "DispatchResult.h"
+#include "Exporter.h"
 #include "FuncStatus.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "lyx_main.h"
-#include "lyxlex.h"
-#include "lyxrc.h"
-#include "metricsinfo.h"
-#include "outputparams.h"
+#include "LyX.h"
+#include "LyXLex.h"
+#include "LyXRC.h"
+#include "MetricsInfo.h"
+#include "OutputParams.h"
 
 #include "graphics/PreviewLoader.h"
 
diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index 74c08f770e..6d123615e7 100644
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -13,22 +13,22 @@
 
 #include "InsetFloat.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "dispatchresult.h"
+#include "DispatchResult.h"
 #include "Floating.h"
 #include "FloatList.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"
-#include "lyxlex.h"
-#include "outputparams.h"
-#include "paragraph.h"
+#include "LyXLex.h"
+#include "OutputParams.h"
+#include "Paragraph.h"
 #include "TocBackend.h"
 
 #include "support/lstrings.h"
diff --git a/src/insets/InsetFloatList.cpp b/src/insets/InsetFloatList.cpp
index e437f13575..c43a64a034 100644
--- a/src/insets/InsetFloatList.cpp
+++ b/src/insets/InsetFloatList.cpp
@@ -12,17 +12,17 @@
 
 #include "InsetFloatList.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "debug.h"
-#include "dispatchresult.h"
+#include "DispatchResult.h"
 #include "Floating.h"
 #include "FloatList.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "lyxlex.h"
-#include "metricsinfo.h"
+#include "LyXLex.h"
+#include "MetricsInfo.h"
 #include "TocBackend.h"
 
 #include "support/lstrings.h"
diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp
index 59c1de30f0..d156e1ae25 100644
--- a/src/insets/InsetFoot.cpp
+++ b/src/insets/InsetFoot.cpp
@@ -16,9 +16,9 @@
 #include "gettext.h"
 // the following are needed just to get the layout of the enclosing
 // paragraph. This seems a bit too much to me (JMarc)
-#include "lyxlayout.h"
-#include "outputparams.h"
-#include "paragraph.h"
+#include "LyXLayout.h"
+#include "OutputParams.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
 
 #include "support/std_ostream.h"
diff --git a/src/insets/InsetFootlike.cpp b/src/insets/InsetFootlike.cpp
index 954081b571..a34b3f1e88 100644
--- a/src/insets/InsetFootlike.cpp
+++ b/src/insets/InsetFootlike.cpp
@@ -12,12 +12,12 @@
 
 #include "InsetFootlike.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "BufferView.h"
-#include "bufferparams.h"
+#include "BufferParams.h"
 #include "LColor.h"
-#include "metricsinfo.h"
-#include "paragraph.h"
+#include "MetricsInfo.h"
+#include "Paragraph.h"
 
 
 namespace lyx {
diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 0b0e9dc533..00ab6c18a8 100644
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -52,23 +52,23 @@ TODO
 #include "insets/InsetGraphics.h"
 #include "insets/RenderGraphic.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "BufferView.h"
-#include "converter.h"
-#include "cursor.h"
+#include "Converter.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "exporter.h"
-#include "format.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "Exporter.h"
+#include "Format.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "lyxlength.h"
-#include "lyxlex.h"
-#include "metricsinfo.h"
-#include "mover.h"
-#include "outputparams.h"
+#include "LyXLength.h"
+#include "LyXLex.h"
+#include "MetricsInfo.h"
+#include "Mover.h"
+#include "OutputParams.h"
 #include "sgml.h"
 
 #include "frontends/Alert.h"
diff --git a/src/insets/InsetGraphicsParams.cpp b/src/insets/InsetGraphicsParams.cpp
index c75872522f..8947a42635 100644
--- a/src/insets/InsetGraphicsParams.cpp
+++ b/src/insets/InsetGraphicsParams.cpp
@@ -14,9 +14,9 @@
 #include "InsetGraphicsParams.h"
 
 #include "debug.h"
-#include "lyx_main.h" // for use_gui
-#include "lyxlex.h"
-#include "lyxrc.h"
+#include "LyX.h" // for use_gui
+#include "LyXLex.h"
+#include "LyXRC.h"
 
 #include "graphics/GraphicsParams.h"
 
diff --git a/src/insets/InsetGraphicsParams.h b/src/insets/InsetGraphicsParams.h
index 2f4ca6e57e..e73c452181 100644
--- a/src/insets/InsetGraphicsParams.h
+++ b/src/insets/InsetGraphicsParams.h
@@ -15,7 +15,7 @@
 
 
 #include "graphics/GraphicsTypes.h"
-#include "lyxlength.h"
+#include "LyXLength.h"
 #include "support/filename.h"
 
 namespace lyx {
diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 42fd20a706..01ee1745d7 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -12,24 +12,24 @@
 
 #include "InsetInclude.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "buffer_funcs.h"
-#include "bufferlist.h"
-#include "bufferparams.h"
+#include "BufferList.h"
+#include "BufferParams.h"
 #include "BufferView.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "exporter.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "Exporter.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "lyx_main.h"
-#include "lyxrc.h"
-#include "lyxlex.h"
-#include "metricsinfo.h"
-#include "outputparams.h"
+#include "LyX.h"
+#include "LyXRC.h"
+#include "LyXLex.h"
+#include "MetricsInfo.h"
+#include "OutputParams.h"
 #include "TocBackend.h"
 
 #include "frontends/Alert.h"
@@ -437,7 +437,7 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
 	} else {
 		// Copy the file to the temp dir, so that .aux files etc.
 		// are not created in the original dir. Files included by
-		// this file will be found via input@path, see ../buffer.C.
+		// this file will be found via input@path, see ../Buffer.cpp.
 		unsigned long const checksum_in  = sum(included_file);
 		unsigned long const checksum_out = sum(writefile);
 
diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index 846aae07db..b43e183116 100644
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -11,11 +11,11 @@
 
 #include "InsetIndex.h"
 
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "metricsinfo.h"
+#include "MetricsInfo.h"
 #include "sgml.h"
 
 #include "support/std_ostream.h"
diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index d1ad08336c..9243f16db1 100644
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -12,14 +12,14 @@
 
 #include "InsetLabel.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "BufferView.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "InsetList.h"
-#include "lyxtext.h"
-#include "paragraph.h"
-#include "pariterator.h"
+#include "LyXText.h"
+#include "Paragraph.h"
+#include "ParIterator.h"
 #include "sgml.h"
 
 #include "support/lstrings.h"
diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp
index f01a720b0f..481bd446c7 100644
--- a/src/insets/InsetLine.cpp
+++ b/src/insets/InsetLine.cpp
@@ -14,10 +14,10 @@
 
 #include "debug.h"
 #include "LColor.h"
-#include "lyxtext.h"
-#include "metricsinfo.h"
+#include "LyXText.h"
+#include "MetricsInfo.h"
 #include "LaTeXFeatures.h"
-#include "outputparams.h"
+#include "OutputParams.h"
 
 #include "frontends/Painter.h"
 
diff --git a/src/insets/InsetMarginal.cpp b/src/insets/InsetMarginal.cpp
index 87492b4de7..3ffbf0c436 100644
--- a/src/insets/InsetMarginal.cpp
+++ b/src/insets/InsetMarginal.cpp
@@ -14,8 +14,8 @@
 #include "InsetMarginal.h"
 
 #include "gettext.h"
-#include "paragraph.h"
-#include "outputparams.h"
+#include "Paragraph.h"
+#include "OutputParams.h"
 
 #include "support/std_ostream.h"
 
diff --git a/src/insets/InsetNewline.cpp b/src/insets/InsetNewline.cpp
index 0bba9e2a5d..bedacaf228 100644
--- a/src/insets/InsetNewline.cpp
+++ b/src/insets/InsetNewline.cpp
@@ -14,10 +14,10 @@
 
 #include "debug.h"
 #include "LColor.h"
-#include "lyxtext.h"
-#include "metricsinfo.h"
-#include "outputparams.h"
-#include "paragraph.h"
+#include "LyXText.h"
+#include "MetricsInfo.h"
+#include "OutputParams.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
 
 #include "frontends/FontMetrics.h"
diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp
index 8c733897e8..838cf552bc 100644
--- a/src/insets/InsetNomencl.cpp
+++ b/src/insets/InsetNomencl.cpp
@@ -13,13 +13,13 @@
 #include "InsetNomencl.h"
 #include "InsetNote.h"
 
-#include "buffer.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "Buffer.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "insetiterator.h"
+#include "InsetIterator.h"
 #include "LaTeXFeatures.h"
-#include "metricsinfo.h"
+#include "MetricsInfo.h"
 #include "sgml.h"
 
 
diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index f643ce8c37..e7244b902d 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -15,19 +15,19 @@
 #include "InsetNote.h"
 
 #include "BufferView.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "exporter.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "Exporter.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"
-#include "lyxlex.h"
-#include "metricsinfo.h"
-#include "outputparams.h"
-#include "paragraph.h"
+#include "LyXLex.h"
+#include "MetricsInfo.h"
+#include "OutputParams.h"
+#include "Paragraph.h"
 
 #include "support/lyxalgo.h"
 #include "support/translator.h"
diff --git a/src/insets/InsetOptArg.cpp b/src/insets/InsetOptArg.cpp
index 40e155ead6..64bf9fa3f1 100644
--- a/src/insets/InsetOptArg.cpp
+++ b/src/insets/InsetOptArg.cpp
@@ -15,7 +15,7 @@
 #include "debug.h"
 #include "gettext.h"
 #include "LColor.h"
-#include "paragraph.h"
+#include "Paragraph.h"
 
 #include <sstream>
 
diff --git a/src/insets/InsetPagebreak.cpp b/src/insets/InsetPagebreak.cpp
index 65683cba6f..0a45f394b3 100644
--- a/src/insets/InsetPagebreak.cpp
+++ b/src/insets/InsetPagebreak.cpp
@@ -15,9 +15,9 @@
 #include "debug.h"
 #include "gettext.h"
 #include "LColor.h"
-#include "lyxtext.h"
-#include "metricsinfo.h"
-#include "outputparams.h"
+#include "LyXText.h"
+#include "MetricsInfo.h"
+#include "OutputParams.h"
 #include "TextMetrics.h"
 
 #include "frontends/FontMetrics.h"
diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp
index 82be45c294..7c66ba8198 100644
--- a/src/insets/InsetQuotes.cpp
+++ b/src/insets/InsetQuotes.cpp
@@ -12,16 +12,16 @@
 
 #include "InsetQuotes.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "debug.h"
-#include "language.h"
+#include "Language.h"
 #include "LaTeXFeatures.h"
-#include "lyxlex.h"
-#include "lyxrc.h"
-#include "metricsinfo.h"
-#include "outputparams.h"
-#include "paragraph.h"
+#include "LyXLex.h"
+#include "LyXRC.h"
+#include "MetricsInfo.h"
+#include "OutputParams.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
 
 #include "frontends/FontMetrics.h"
diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index 92db373c22..5044365eb4 100644
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -11,14 +11,14 @@
 
 #include "InsetRef.h"
 
-#include "buffer.h"
-#include "cursor.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "Buffer.h"
+#include "LCursor.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "lyxfunc.h"
-#include "outputparams.h"
+#include "LyXFunc.h"
+#include "OutputParams.h"
 #include "sgml.h"
 
 #include "support/lstrings.h"
diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp
index aeb3dd697e..08b676d53e 100644
--- a/src/insets/InsetSpace.cpp
+++ b/src/insets/InsetSpace.cpp
@@ -17,9 +17,9 @@
 
 #include "debug.h"
 #include "LColor.h"
-#include "lyxlex.h"
-#include "metricsinfo.h"
-#include "outputparams.h"
+#include "LyXLex.h"
+#include "MetricsInfo.h"
+#include "OutputParams.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
diff --git a/src/insets/InsetSpecialChar.cpp b/src/insets/InsetSpecialChar.cpp
index 361554628d..beb80116d4 100644
--- a/src/insets/InsetSpecialChar.cpp
+++ b/src/insets/InsetSpecialChar.cpp
@@ -17,8 +17,8 @@
 #include "debug.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"
-#include "lyxlex.h"
-#include "metricsinfo.h"
+#include "LyXLex.h"
+#include "MetricsInfo.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
diff --git a/src/insets/InsetTOC.cpp b/src/insets/InsetTOC.cpp
index bb4367ed0c..f583810ff0 100644
--- a/src/insets/InsetTOC.cpp
+++ b/src/insets/InsetTOC.cpp
@@ -12,12 +12,12 @@
 
 #include "InsetTOC.h"
 
-#include "buffer.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "Buffer.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "metricsinfo.h"
-#include "outputparams.h"
+#include "MetricsInfo.h"
+#include "OutputParams.h"
 #include "TocBackend.h"
 
 #include "support/std_ostream.h"
diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index c1b140534c..42136e7fa3 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -12,27 +12,27 @@
 
 #include "InsetTabular.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "CutAndPaste.h"
-#include "coordcache.h"
+#include "CoordCache.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
-#include "language.h"
+#include "Language.h"
 #include "LColor.h"
 #include "lyx_cb.h"
-#include "lyxlex.h"
-#include "metricsinfo.h"
-#include "outputparams.h"
-#include "paragraph.h"
+#include "LyXLex.h"
+#include "MetricsInfo.h"
+#include "OutputParams.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
-#include "undo.h"
+#include "Undo.h"
 
 #include "support/convert.h"
 
diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h
index 537043b05b..e09d7eebcc 100644
--- a/src/insets/InsetTabular.h
+++ b/src/insets/InsetTabular.h
@@ -33,7 +33,7 @@
 #define INSETTABULAR_H
 
 #include "Inset.h"
-#include "tabular.h"
+#include "LyXTabular.h"
 #include "MailInset.h"
 
 namespace lyx {
diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index e54771a656..011ce97b06 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -13,36 +13,36 @@
 #include "InsetText.h"
 #include "InsetNewline.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
-#include "coordcache.h"
+#include "CoordCache.h"
 #include "CutAndPaste.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "errorlist.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "ErrorList.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "intl.h"
+#include "Intl.h"
 #include "LColor.h"
 #include "lyxfind.h"
-#include "lyxlex.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
-#include "metricsinfo.h"
-#include "outputparams.h"
+#include "LyXLex.h"
+#include "LyXRC.h"
+#include "LyXText.h"
+#include "MetricsInfo.h"
+#include "OutputParams.h"
 #include "output_docbook.h"
 #include "output_latex.h"
 #include "output_plaintext.h"
-#include "paragraph.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "rowpainter.h"
-#include "lyxrow.h"
+#include "Row.h"
 #include "sgml.h"
-#include "texrow.h"
-#include "undo.h"
+#include "TexRow.h"
+#include "Undo.h"
 
 #include "frontends/Alert.h"
 #include "frontends/Painter.h"
diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 48c72a85f2..0b9222bf3e 100644
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -14,8 +14,8 @@
 
 #include "Inset.h"
 #include "RowList_fwd.h"
-#include "lyxfont.h"
-#include "lyxtext.h"
+#include "LyXFont.h"
+#include "LyXText.h"
 #include "ParagraphList_fwd.h"
 
 #include "support/types.h"
diff --git a/src/insets/InsetTheorem.cpp b/src/insets/InsetTheorem.cpp
index dddd660a11..04acc8a6f7 100644
--- a/src/insets/InsetTheorem.cpp
+++ b/src/insets/InsetTheorem.cpp
@@ -15,9 +15,9 @@
 
 #include "debug.h"
 #include "gettext.h"
-#include "lyxfont.h"
-#include "lyxtext.h"
-#include "metricsinfo.h"
+#include "LyXFont.h"
+#include "LyXText.h"
+#include "MetricsInfo.h"
 
 #include "support/std_ostream.h"
 
diff --git a/src/insets/InsetUrl.cpp b/src/insets/InsetUrl.cpp
index 8ad3a7ea2e..dded3eb4e3 100644
--- a/src/insets/InsetUrl.cpp
+++ b/src/insets/InsetUrl.cpp
@@ -12,11 +12,11 @@
 
 #include "InsetUrl.h"
 
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "LaTeXFeatures.h"
 #include "gettext.h"
-#include "outputparams.h"
+#include "OutputParams.h"
 
 #include "support/lstrings.h"
 
diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp
index 95b8b70b4c..2e8d392a7a 100644
--- a/src/insets/InsetVSpace.cpp
+++ b/src/insets/InsetVSpace.cpp
@@ -13,16 +13,16 @@
 
 #include "InsetVSpace.h"
 
-#include "buffer.h"
-#include "cursor.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "Buffer.h"
+#include "LCursor.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "gettext.h"
 #include "LColor.h"
-#include "lyxlex.h"
-#include "lyxtext.h"
-#include "metricsinfo.h"
-#include "outputparams.h"
+#include "LyXLex.h"
+#include "LyXText.h"
+#include "MetricsInfo.h"
+#include "OutputParams.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
diff --git a/src/insets/InsetVSpace.h b/src/insets/InsetVSpace.h
index 12c6f12335..0d90e65fc3 100644
--- a/src/insets/InsetVSpace.h
+++ b/src/insets/InsetVSpace.h
@@ -14,7 +14,7 @@
 
 
 #include "Inset.h"
-#include "vspace.h"
+#include "VSpace.h"
 #include "MailInset.h"
 
 
diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index d15adbf3ec..89a4643076 100644
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -12,22 +12,22 @@
 
 #include "InsetWrap.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "dispatchresult.h"
+#include "DispatchResult.h"
 #include "Floating.h"
 #include "FloatList.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"
-#include "lyxlex.h"
-#include "outputparams.h"
-#include "paragraph.h"
+#include "LyXLex.h"
+#include "OutputParams.h"
+#include "Paragraph.h"
 #include "TocBackend.h"
 
 #include "support/convert.h"
diff --git a/src/insets/InsetWrap.h b/src/insets/InsetWrap.h
index 9bf84475e3..3da66712be 100644
--- a/src/insets/InsetWrap.h
+++ b/src/insets/InsetWrap.h
@@ -13,7 +13,7 @@
 #define INSETWRAP_H
 
 #include "InsetCollapsable.h"
-#include "lyxlength.h"
+#include "LyXLength.h"
 #include "MailInset.h"
 
 
diff --git a/src/insets/RenderBase.h b/src/insets/RenderBase.h
index 28876e45f5..9657f48f5b 100644
--- a/src/insets/RenderBase.h
+++ b/src/insets/RenderBase.h
@@ -12,7 +12,7 @@
 #ifndef RENDERBASE_H
 #define RENDERBASE_H
 
-#include "dimension.h"
+#include "Dimension.h"
 
 #include <memory>
 
diff --git a/src/insets/RenderButton.cpp b/src/insets/RenderButton.cpp
index efcc1e7a42..b13afada17 100644
--- a/src/insets/RenderButton.cpp
+++ b/src/insets/RenderButton.cpp
@@ -13,7 +13,7 @@
 #include "RenderButton.h"
 
 #include "LColor.h"
-#include "metricsinfo.h"
+#include "MetricsInfo.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
diff --git a/src/insets/RenderButton.h b/src/insets/RenderButton.h
index a828054c82..59d09bb711 100644
--- a/src/insets/RenderButton.h
+++ b/src/insets/RenderButton.h
@@ -13,7 +13,7 @@
 #define RENDERBUTTON_H
 
 #include "RenderBase.h"
-#include "box.h"
+#include "Box.h"
 #include "support/docstring.h"
 
 
diff --git a/src/insets/RenderGraphic.cpp b/src/insets/RenderGraphic.cpp
index c30a0741ce..99f1d34023 100644
--- a/src/insets/RenderGraphic.cpp
+++ b/src/insets/RenderGraphic.cpp
@@ -16,9 +16,9 @@
 
 #include "gettext.h"
 #include "LColor.h"
-#include "lyx_main.h"
-#include "lyxrc.h"
-#include "metricsinfo.h"
+#include "LyX.h"
+#include "LyXRC.h"
+#include "MetricsInfo.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index 54c0f7d7c4..b953d790e3 100644
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -14,12 +14,12 @@
 #include "insets/Inset.h"
 
 #include "BufferView.h"
-#include "dimension.h"
+#include "Dimension.h"
 #include "gettext.h"
 #include "LColor.h"
-#include "lyx_main.h"
-#include "lyxrc.h"
-#include "metricsinfo.h"
+#include "LyX.h"
+#include "LyXRC.h"
+#include "MetricsInfo.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
diff --git a/src/intl.C b/src/intl.C
index 92a802e313..fe91d4e7e0 100644
--- a/src/intl.C
+++ b/src/intl.C
@@ -1,5 +1,5 @@
 /**
- * \file intl.h
+ * \file Intl.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,9 +13,9 @@
 
 #include <config.h>
 
-#include "intl.h"
+#include "Intl.h"
 #include "debug.h"
-#include "lyxrc.h"
+#include "LyXRC.h"
 
 
 namespace lyx {
diff --git a/src/intl.h b/src/intl.h
index 07de268332..d7c903b229 100644
--- a/src/intl.h
+++ b/src/intl.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file intl.h
+ * \file Intl.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,7 +15,7 @@
 #ifndef INTL_H
 #define INTL_H
 
-#include "trans_mgr.h"
+#include "TransState.h"
 
 
 namespace lyx {
diff --git a/src/ispell.C b/src/ispell.C
index 3813ec4706..d89814ac02 100644
--- a/src/ispell.C
+++ b/src/ispell.C
@@ -1,5 +1,5 @@
 /**
- * \file ispell.C
+ * \file ISpell.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,14 +12,14 @@
 
 #include <config.h>
 
-#include "ispell.h"
+#include "ISpell.h"
 
-#include "bufferparams.h"
+#include "BufferParams.h"
 #include "debug.h"
-#include "encoding.h"
+#include "Encoding.h"
 #include "gettext.h"
-#include "language.h"
-#include "lyxrc.h"
+#include "Language.h"
+#include "LyXRC.h"
 #include "WordLangTuple.h"
 
 #include "support/forkedcall.h"
diff --git a/src/ispell.h b/src/ispell.h
index 3aed4d5f41..7e164e2705 100644
--- a/src/ispell.h
+++ b/src/ispell.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file ispell.h
+ * \file ISpell.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/kbmap.C b/src/kbmap.C
index a9d1460c85..f3bb8d2a15 100644
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -1,5 +1,5 @@
 /**
- * \file kbmap.C
+ * \file kb_keymap.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,12 +13,12 @@
 
 #include <config.h>
 
-#include "kbmap.h"
+#include "kb_keymap.h"
 
 #include "debug.h"
-#include "kbsequence.h"
+#include "kb_sequence.h"
 #include "LyXAction.h"
-#include "lyxlex.h"
+#include "LyXLex.h"
 
 #include "frontends/LyXKeySym.h"
 
diff --git a/src/kbmap.h b/src/kbmap.h
index 2ffe6885f1..2f486b09a9 100644
--- a/src/kbmap.h
+++ b/src/kbmap.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file kbmap.h
+ * \file kb_keymap.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,10 +11,10 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef KBMAP_H
-#define KBMAP_H
+#ifndef KB_KEYMAP_H
+#define KB_KEYMAP_H
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include "frontends/key_state.h"
 #include "frontends/LyXKeySym.h"
@@ -132,10 +132,10 @@ private:
 	Table table;
 };
 
-/// Implementation is in lyx_main.C
+/// Implementation is in LyX.cpp
 extern kb_keymap & theTopLevelKeymap();
 
 
 } // namespace lyx
 
-#endif // KBMAP_H
+#endif // KB_KEYMAP_H
diff --git a/src/kbsequence.C b/src/kbsequence.C
index 9277793fcc..a51444789d 100644
--- a/src/kbsequence.C
+++ b/src/kbsequence.C
@@ -1,5 +1,5 @@
 /**
- * \file kbsequence.C
+ * \file kb_sequence.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,10 +12,10 @@
 
 #include <config.h>
 
-#include "kbsequence.h"
+#include "kb_sequence.h"
 
 #include "gettext.h"
-#include "kbmap.h"
+#include "kb_keymap.h"
 #include "lfuns.h"
 
 #include "frontends/LyXKeySym.h"
diff --git a/src/kbsequence.h b/src/kbsequence.h
index 6dc269a035..52883d689a 100644
--- a/src/kbsequence.h
+++ b/src/kbsequence.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file kbsequence.h
+ * \file kb_sequence.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,8 +10,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef KBSEQUENCE_H
-#define KBSEQUENCE_H
+#ifndef KB_SEQUENCE_H
+#define KB_SEQUENCE_H
 
 #include "frontends/key_state.h"
 #include "frontends/LyXKeySym.h"
diff --git a/src/language.C b/src/language.C
index 754ebfd64d..5820711fc1 100644
--- a/src/language.C
+++ b/src/language.C
@@ -1,5 +1,5 @@
 /**
- * \file language.C
+ * \file Language.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,12 +12,12 @@
 
 #include <config.h>
 
-#include "language.h"
+#include "Language.h"
 
 #include "debug.h"
-#include "encoding.h"
-#include "lyxlex.h"
-#include "lyxrc.h"
+#include "Encoding.h"
+#include "LyXLex.h"
+#include "LyXRC.h"
 
 #include "support/filename.h"
 
diff --git a/src/language.h b/src/language.h
index 77a0a0a432..59085ec847 100644
--- a/src/language.h
+++ b/src/language.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file language.h
+ * \file Language.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/lengthcommon.C b/src/lengthcommon.C
index dde8d54c16..4b6a45a6ae 100644
--- a/src/lengthcommon.C
+++ b/src/lengthcommon.C
@@ -1,5 +1,5 @@
 /**
- * \file lengthcommon.C
+ * \file lengthcommon.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/lengthcommon.h b/src/lengthcommon.h
index 7dcf3d91b5..9a2acaa40b 100644
--- a/src/lengthcommon.h
+++ b/src/lengthcommon.h
@@ -15,7 +15,7 @@
 #ifndef LENGTH_COMMON_H
 #define LENGTH_COMMON_H
 
-#include "lyxlength.h"
+#include "LyXLength.h"
 
 
 namespace lyx {
diff --git a/src/lfuns.h b/src/lfuns.h
index d630ef5c9b..cbb1ac89d2 100644
--- a/src/lfuns.h
+++ b/src/lfuns.h
@@ -8,7 +8,7 @@
  *
  * To add a new function:
  * - add a new enum constant immediately before LFUN_LASTACTION
- * - add an appropriate line in LyXAction.C
+ * - add an appropriate line in LyXAction.cpp
  * - add a branch to a suitable ::doDispatch() method
  * - add correct test to the corresponding ::getStatus() method
  */
@@ -24,7 +24,7 @@ namespace lyx {
 /** These are all the lyx functions, the main mechanism
  * through which the frontends communicate with the core.
  *
- * They are managed in LyXAction.C and handled in various
+ * They are managed in LyXAction.cpp and handled in various
  * ::dispatch() functions, starting with LyXFunc.C:dispatch(),
  * BufferView::dispatch(), LCursor::dispatch() and
  * Inset*::doDispatch();
diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 533ef99e92..83dce77c1f 100644
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -1,5 +1,5 @@
 /**
- * \file lyx_cb.C
+ * \file lyx_cb.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,22 +16,22 @@
 
 #include "lyx_cb.h"
 
-#include "buffer.h"
-#include "bufferlist.h"
+#include "Buffer.h"
+#include "BufferList.h"
 #include "BufferView.h"
 #include "buffer_funcs.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "CutAndPaste.h"
 #include "debug.h"
 #include "gettext.h"
-#include "session.h"
+#include "Session.h"
 #include "LaTeXFeatures.h"
-#include "lyx_main.h"
-#include "lyxlayout.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
-#include "paragraph.h"
-#include "undo.h"
+#include "LyX.h"
+#include "LyXLayout.h"
+#include "LyXRC.h"
+#include "LyXText.h"
+#include "Paragraph.h"
+#include "Undo.h"
 
 #include "frontends/Alert.h"
 #include "frontends/Application.h"
@@ -93,7 +93,7 @@ using std::ios;
 using std::istream_iterator;
 
 
-// this should be static, but I need it in buffer.C
+// this should be static, but I need it in Buffer.cpp
 bool quitting;	// flag, that we are quitting the program
 
 //
diff --git a/src/lyx_main.C b/src/lyx_main.C
index 548ff140d9..9d3b26f7c0 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -1,5 +1,5 @@
 /**
- * \file lyx_main.C
+ * \file LyX.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,33 +15,33 @@
 #include <config.h>
 #include <version.h>
 
-#include "lyx_main.h"
+#include "LyX.h"
 
 #include "ConverterCache.h"
-#include "buffer.h"
+#include "Buffer.h"
 #include "buffer_funcs.h"
-#include "bufferlist.h"
-#include "converter.h"
+#include "BufferList.h"
+#include "Converter.h"
 #include "debug.h"
-#include "encoding.h"
-#include "errorlist.h"
-#include "format.h"
+#include "Encoding.h"
+#include "ErrorList.h"
+#include "Format.h"
 #include "gettext.h"
-#include "kbmap.h"
-#include "language.h"
-#include "session.h"
+#include "kb_keymap.h"
+#include "Language.h"
+#include "Session.h"
 #include "LColor.h"
 #include "lyx_cb.h"
 #include "LyXAction.h"
-#include "lyxfunc.h"
-#include "lyxlex.h"
-#include "lyxrc.h"
-#include "lyxserver.h"
-#include "lyxsocket.h"
-#include "lyxtextclasslist.h"
+#include "LyXFunc.h"
+#include "LyXLex.h"
+#include "LyXRC.h"
+#include "LyXServer.h"
+#include "LyXServerSocket.h"
+#include "LyXTextClassList.h"
 #include "MenuBackend.h"
-#include "messages.h"
-#include "mover.h"
+#include "Messages.h"
+#include "Mover.h"
 #include "ToolbarBackend.h"
 
 #include "frontends/Alert.h"
diff --git a/src/lyx_main.h b/src/lyx_main.h
index 71d8e8370a..33f9924179 100644
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyx_main.h
+ * \file LyX.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,8 +11,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef LYX_MAIN_H
-#define LYX_MAIN_H
+#ifndef LYX_H
+#define LYX_H
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/utility.hpp>
@@ -174,4 +174,4 @@ private:
 
 } // namespace lyx
 
-#endif // LYX_MAIN_H
+#endif // LYX_H
diff --git a/src/lyx_sty.C b/src/lyx_sty.C
index 9e7d56fdbf..0104db48ed 100644
--- a/src/lyx_sty.C
+++ b/src/lyx_sty.C
@@ -1,5 +1,5 @@
 /**
- * \file lyx_sty.C
+ * \file lyx_sty.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/lyxfind.C b/src/lyxfind.C
index 6de1690977..f800134927 100644
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -1,5 +1,5 @@
 /**
- * \file lyxfind.C
+ * \file lyxfind.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,18 +15,18 @@
 
 #include "lyxfind.h"
 
-#include "buffer.h"
-#include "cursor.h"
+#include "Buffer.h"
+#include "LCursor.h"
 #include "CutAndPaste.h"
 #include "buffer_funcs.h"
 #include "BufferView.h"
 #include "debug.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "lyxtext.h"
-#include "paragraph.h"
-#include "pariterator.h"
-#include "undo.h"
+#include "LyXText.h"
+#include "Paragraph.h"
+#include "ParIterator.h"
+#include "Undo.h"
 
 #include "frontends/Alert.h"
 
diff --git a/src/lyxfont.C b/src/lyxfont.C
index 05949567d5..8fcc1b2027 100644
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -1,5 +1,5 @@
 /**
- * \file src/lyxfont.C
+ * \file src/LyXFont.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,15 +14,15 @@
 
 #include <config.h>
 
-#include "lyxfont.h"
+#include "LyXFont.h"
 
-#include "bufferparams.h" // stateText
+#include "BufferParams.h" // stateText
 #include "debug.h"
 #include "gettext.h"
-#include "language.h"
+#include "Language.h"
 #include "LColor.h"
-#include "lyxlex.h"
-#include "lyxrc.h"
+#include "LyXLex.h"
+#include "LyXRC.h"
 
 #include "support/lstrings.h"
 
diff --git a/src/lyxfont.h b/src/lyxfont.h
index 3d61113748..50556a71bb 100644
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file src/lyxfont.h
+ * \file src/LyXFont.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -356,7 +356,7 @@ private:
 
 /** \c LyXFont_size is a wrapper for LyXFont::FONT_SIZE.
  *  It can be forward-declared and passed as a function argument without
- *  having to expose lyxfont.h.
+ *  having to expose LyXFont.h.
  */
 class LyXFont_size {
 public:
diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 0f6588ebe9..aac47c13fe 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -1,5 +1,5 @@
 /**
- * \file lyxfunc.C
+ * \file LyXFunc.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -19,47 +19,47 @@
 
 #include <config.h>
 
-#include "lyxfunc.h"
+#include "LyXFunc.h"
 
 #include "BranchList.h"
-#include "buffer.h"
+#include "Buffer.h"
 #include "buffer_funcs.h"
-#include "bufferlist.h"
-#include "bufferparams.h"
+#include "BufferList.h"
+#include "BufferParams.h"
 #include "BufferView.h"
 #include "bufferview_funcs.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "CutAndPaste.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "encoding.h"
-#include "errorlist.h"
-#include "exporter.h"
-#include "format.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "Encoding.h"
+#include "ErrorList.h"
+#include "Exporter.h"
+#include "Format.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
-#include "importer.h"
-#include "insetiterator.h"
-#include "intl.h"
-#include "kbmap.h"
-#include "language.h"
+#include "Importer.h"
+#include "InsetIterator.h"
+#include "Intl.h"
+#include "kb_keymap.h"
+#include "Language.h"
 #include "LColor.h"
-#include "session.h"
-#include "lyx_main.h"
+#include "Session.h"
+#include "LyX.h"
 #include "lyx_cb.h"
 #include "LyXAction.h"
 #include "lyxfind.h"
-#include "lyxlex.h"
-#include "lyxrc.h"
-#include "lyxrow.h"
-#include "lyxserver.h"
-#include "lyxtextclasslist.h"
-#include "lyxvc.h"
-#include "paragraph.h"
-#include "pariterator.h"
+#include "LyXLex.h"
+#include "LyXRC.h"
+#include "Row.h"
+#include "LyXServer.h"
+#include "LyXTextClassList.h"
+#include "LyXVC.h"
+#include "Paragraph.h"
+#include "ParIterator.h"
 #include "ParagraphParameters.h"
-#include "undo.h"
+#include "Undo.h"
 
 #include "insets/InsetBox.h"
 #include "insets/InsetBranch.h"
diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index 4fce15e678..ec31fc2634 100644
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyxfunc.h
+ * \file LyXFunc.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,7 +15,7 @@
 #ifndef LYXFUNC_H
 #define LYXFUNC_H
 
-#include "kbsequence.h"
+#include "kb_sequence.h"
 #include "lfuns.h"
 
 #include "support/docstring.h"
@@ -125,13 +125,13 @@ private:
 	bool ensureBufferClean(BufferView * bv);
 };
 
-/// Implementation is in lyx_main.C
+/// Implementation is in LyX.cpp
 extern LyXFunc & theLyXFunc();
 
-/// Implementation is in lyx_main.C
+/// Implementation is in LyX.cpp
 extern FuncStatus getStatus(FuncRequest const & action);
 
-/// Implementation is in lyx_main.C
+/// Implementation is in LyX.cpp
 extern void dispatch(FuncRequest const & action);
 
 } // namespace lyx
diff --git a/src/lyxgluelength.C b/src/lyxgluelength.C
index fbea55bbd0..046e5461d0 100644
--- a/src/lyxgluelength.C
+++ b/src/lyxgluelength.C
@@ -1,5 +1,5 @@
 /**
- * \file lyxgluelength.C
+ * \file LyXGlueLength.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 
 #include <config.h>
 
-#include "lyxgluelength.h"
+#include "LyXGlueLength.h"
 #include "lengthcommon.h"
 
 #include <sstream>
diff --git a/src/lyxgluelength.h b/src/lyxgluelength.h
index 667efa826e..f60f42374f 100644
--- a/src/lyxgluelength.h
+++ b/src/lyxgluelength.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyxgluelength.h
+ * \file LyXGlueLength.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,7 +14,7 @@
 #ifndef LYX_GLUE_LENGTH_H
 #define LYX_GLUE_LENGTH_H
 
-#include "lyxlength.h"
+#include "LyXLength.h"
 
 
 namespace lyx {
diff --git a/src/lyxlayout.C b/src/lyxlayout.C
index b5f7223c6e..9307539bac 100644
--- a/src/lyxlayout.C
+++ b/src/lyxlayout.C
@@ -1,5 +1,5 @@
 /**
- * \file lyxlayout.C
+ * \file LyXLayout.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,9 +12,9 @@
 
 #include <config.h>
 
-#include "lyxlayout.h"
-#include "lyxtextclass.h"
-#include "lyxlex.h"
+#include "LyXLayout.h"
+#include "LyXTextClass.h"
+#include "LyXLex.h"
 #include "debug.h"
 
 #include "support/lstrings.h"
@@ -194,7 +194,7 @@ bool LyXLayout::read(LyXLex & lexrc, LyXTextClass const & tclass)
 	// parse style section
 	while (!finished && lexrc.isOK() && !error) {
 		int le = lexrc.lex();
-		// See comment in lyxrc.C.
+		// See comment in LyXRC.cpp.
 		switch (le) {
 		case LyXLex::LEX_FEOF:
 			continue;
diff --git a/src/lyxlayout.h b/src/lyxlayout.h
index 7cdff88aa0..de81f14552 100644
--- a/src/lyxlayout.h
+++ b/src/lyxlayout.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyxlayout.h
+ * \file LyXLayout.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,7 +14,7 @@
 #ifndef LYX_LAYOUT_H
 #define LYX_LAYOUT_H
 
-#include "lyxfont.h"
+#include "LyXFont.h"
 #include "layout.h"
 #include "Spacing.h"
 #include "support/docstring.h"
diff --git a/src/lyxlength.C b/src/lyxlength.C
index fded92c19b..ae75fcd7eb 100644
--- a/src/lyxlength.C
+++ b/src/lyxlength.C
@@ -1,5 +1,5 @@
 /**
- * \file lyxlength.C
+ * \file LyXLength.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,9 +15,9 @@
 
 #include <config.h>
 
-#include "lyxlength.h"
+#include "LyXLength.h"
 #include "lengthcommon.h"
-#include "lyxrc.h"
+#include "LyXRC.h"
 
 #include "support/docstream.h"
 #include <sstream>
diff --git a/src/lyxlength.h b/src/lyxlength.h
index 1fc9e6f79c..3ffc51cba4 100644
--- a/src/lyxlength.h
+++ b/src/lyxlength.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyxlength.h
+ * \file LyXLength.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/lyxlex.C b/src/lyxlex.C
index 24b8072f12..9e2432daad 100644
--- a/src/lyxlex.C
+++ b/src/lyxlex.C
@@ -1,5 +1,5 @@
 /**
- * \file lyxlex.C
+ * \file LyXLex.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 
 #include <config.h>
 
-#include "lyxlex.h"
+#include "LyXLex.h"
 
 #include "debug.h"
 
diff --git a/src/lyxlex.h b/src/lyxlex.h
index 155aa380f0..2ab2fef31e 100644
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyxlex.h
+ * \file LyXLex.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -53,7 +53,7 @@ struct keyword_item {
 		return param;
 	} 
 
-    @see lyxrc.C for an example of usage.
+    @see LyXRC.cpp for an example of usage.
   */
 class LyXLex : boost::noncopyable {
 public:
diff --git a/src/lyxrc.C b/src/lyxrc.C
index fb61503b76..4aed81f0a6 100644
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -1,5 +1,5 @@
 /**
- * \file lyxrc.C
+ * \file LyXRC.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -19,17 +19,17 @@
 #include <fstream>
 #include <iostream>
 
-#include "lyxrc.h"
+#include "LyXRC.h"
 
 #include "debug.h"
-#include "converter.h"
-#include "format.h"
+#include "Converter.h"
+#include "Format.h"
 #include "gettext.h"
-#include "session.h"
+#include "Session.h"
 #include "LColor.h"
-#include "lyxlex.h"
-#include "lyxfont.h"
-#include "mover.h"
+#include "LyXLex.h"
+#include "LyXFont.h"
+#include "Mover.h"
 
 #include "graphics/GraphicsTypes.h"
 
diff --git a/src/lyxrc.h b/src/lyxrc.h
index 04f202dfa5..5e962a7fc1 100644
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyxrc.h
+ * \file LyXRC.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -374,7 +374,7 @@ public:
 
 /** \c LyXRC_PreviewStatus is a wrapper for LyXRC::PreviewStatus.
  *  It can be forward-declared and passed as a function argument without
- *  having to expose lyxrc.h.
+ *  having to expose LyXRC.h.
  */
 class LyXRC_PreviewStatus {
 	LyXRC::PreviewStatus val_;
diff --git a/src/lyxrow.C b/src/lyxrow.C
index 179354bad8..8651763d88 100644
--- a/src/lyxrow.C
+++ b/src/lyxrow.C
@@ -1,5 +1,5 @@
 /**
- * \file lyxrow.C
+ * \file Row.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include "lyxrow.h"
+#include "Row.h"
 #include "debug.h"
 
 
diff --git a/src/lyxrow.h b/src/lyxrow.h
index 652366abcf..7d9a891fd1 100644
--- a/src/lyxrow.h
+++ b/src/lyxrow.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyxrow.h
+ * \file Row.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,8 +12,8 @@
  * Metrics for an on-screen text row.
  */
 
-#ifndef LYXROW_H
-#define LYXROW_H
+#ifndef ROW_H
+#define ROW_H
 
 #include "support/types.h"
 
diff --git a/src/lyxserver.C b/src/lyxserver.C
index bcf9a321c5..af6f1eb903 100644
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -1,5 +1,5 @@
 /**
- * \file lyxserver.C
+ * \file LyXServer.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -39,11 +39,11 @@
 
 #include <config.h>
 
-#include "lyxserver.h"
+#include "LyXServer.h"
 #include "debug.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "LyXAction.h"
-#include "lyxfunc.h"
+#include "LyXFunc.h"
 #include "frontends/Application.h"
 
 #include "support/filename.h"
diff --git a/src/lyxserver.h b/src/lyxserver.h
index 18623578d8..6410123693 100644
--- a/src/lyxserver.h
+++ b/src/lyxserver.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyxserver.h
+ * \file LyXServer.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -143,7 +143,7 @@ private:
 	LyXComm pipes;
 };
 
-/// Implementation is in lyx_main.C
+/// Implementation is in LyX.cpp
 extern LyXServer & theLyXServer();
 
 
@@ -151,4 +151,4 @@ extern LyXServer & theLyXServer();
 
 #endif /* _LYXSERVER_H_ */
 
-/* === End of File: lyxserver.h ========================================== */
+/* === End of File: LyXServer.h ========================================== */
diff --git a/src/lyxsocket.C b/src/lyxsocket.C
index c40feba259..e75f340c97 100644
--- a/src/lyxsocket.C
+++ b/src/lyxsocket.C
@@ -1,5 +1,5 @@
 /**
- * \file lyxsocket.C
+ * \file LyXServerSocket.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,12 +14,12 @@
 
 #include <config.h>
 
-#include "lyxsocket.h"
+#include "LyXServerSocket.h"
 
 #include "debug.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "LyXAction.h"
-#include "lyxfunc.h"
+#include "LyXFunc.h"
 
 #include "frontends/Application.h"
 
diff --git a/src/lyxsocket.h b/src/lyxsocket.h
index fab8c00bbb..72472fe8d1 100644
--- a/src/lyxsocket.h
+++ b/src/lyxsocket.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyxsocket.h
+ * \file LyXServerSocket.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,12 +11,12 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef LYXSOCKET_H
-#define LYXSOCKET_H
+#ifndef LYXSERVERSOCKET_H
+#define LYXSERVERSOCKET_H
 
 #include "support/filename.h"
 #include "support/socktools.h"
-#include "lyxfunc.h"
+#include "LyXFunc.h"
 
 #include <boost/shared_ptr.hpp>
 
@@ -93,10 +93,10 @@ private:
 	std::string buffer_;
 };
 
-/// Implementation is in lyx_main.C
+/// Implementation is in LyX.cpp
 extern LyXServerSocket & theLyXServerSocket();
 
 
 } // namespace lyx
 
-#endif // LYXSOCKET_H
+#endif // LYXSERVERSOCKET_H
diff --git a/src/lyxtext.h b/src/lyxtext.h
index 49a4c97a3e..5a74e25cb9 100644
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyxtext.h
+ * \file LyXText.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,8 +15,8 @@
 #define LYXTEXT_H
 
 #include "Bidi.h"
-#include "dispatchresult.h"
-#include "lyxfont.h"
+#include "DispatchResult.h"
+#include "LyXFont.h"
 #include "layout.h"
 #include "lyxlayout_ptr_fwd.h"
 #include "ParagraphList.h"
diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index 52ec9fdce8..bdbee19ea6 100644
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -1,5 +1,5 @@
 /**
- * \file lyxtextclass.C
+ * \file LyXTextClass.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,10 +14,10 @@
 
 #include <config.h>
 
-#include "lyxtextclass.h"
+#include "LyXTextClass.h"
 #include "debug.h"
-#include "lyxlex.h"
-#include "counters.h"
+#include "LyXLex.h"
+#include "Counters.h"
 #include "Floating.h"
 #include "FloatList.h"
 
diff --git a/src/lyxtextclass.h b/src/lyxtextclass.h
index 2936b13d24..f3bd7c63d8 100644
--- a/src/lyxtextclass.h
+++ b/src/lyxtextclass.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyxtextclass.h
+ * \file LyXTextClass.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 #ifndef LYXTEXTCLASS_H
 #define LYXTEXTCLASS_H
 
-#include "lyxlayout.h"
+#include "LyXLayout.h"
 #include "lyxlayout_ptr_fwd.h"
 
 #include <boost/shared_ptr.hpp>
diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index d5eeeefdbe..813db6c65e 100644
--- a/src/lyxtextclasslist.C
+++ b/src/lyxtextclasslist.C
@@ -1,5 +1,5 @@
 /**
- * \file lyxtextclasslist.C
+ * \file LyXTextClassList.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,10 +11,10 @@
 
 #include <config.h>
 
-#include "lyxtextclasslist.h"
-#include "lyxtextclass.h"
+#include "LyXTextClassList.h"
+#include "LyXTextClass.h"
 #include "debug.h"
-#include "lyxlex.h"
+#include "LyXLex.h"
 
 #include "support/filetools.h"
 
diff --git a/src/lyxtextclasslist.h b/src/lyxtextclasslist.h
index fdf6d98b2c..4415858815 100644
--- a/src/lyxtextclasslist.h
+++ b/src/lyxtextclasslist.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyxtextclasslist.h
+ * \file LyXTextClassList.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef LYXTEXTCLASSLIST_H
 #define LYXTEXTCLASSLIST_H
 
-#include "lyxtextclass.h"
+#include "LyXTextClass.h"
 
 #include "support/types.h"
 
diff --git a/src/lyxvc.C b/src/lyxvc.C
index 807226427e..8d72962ed4 100644
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -1,5 +1,5 @@
 /**
- * \file lyxvc.C
+ * \file LyXVC.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,10 +15,10 @@
 
 #include <config.h>
 
-#include "lyxvc.h"
-#include "vc-backend.h"
+#include "LyXVC.h"
+#include "VCBackend.h"
 #include "debug.h"
-#include "buffer.h"
+#include "Buffer.h"
 #include "gettext.h"
 
 #include "frontends/Alert.h"
diff --git a/src/lyxvc.h b/src/lyxvc.h
index 6ce52cbb23..1a23afaa9f 100644
--- a/src/lyxvc.h
+++ b/src/lyxvc.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lyxvc.h
+ * \file LyXVC.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/main.C b/src/main.C
index dc5c978237..a82663b857 100644
--- a/src/main.C
+++ b/src/main.C
@@ -1,5 +1,5 @@
 /**
- * \file main.C
+ * \file main.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "debug.h"
-#include "lyx_main.h"
+#include "LyX.h"
 #include "gettext.h"
 
 #include "support/os.h"
diff --git a/src/mathed/CommandInset.cpp b/src/mathed/CommandInset.cpp
index 23de2c5d52..55aa8d13ec 100644
--- a/src/mathed/CommandInset.cpp
+++ b/src/mathed/CommandInset.cpp
@@ -13,8 +13,8 @@
 #include "CommandInset.h"
 #include "MathArray.h"
 #include "MathStream.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 
 #include <sstream>
 
diff --git a/src/mathed/InsetFormulaMacro.cpp b/src/mathed/InsetFormulaMacro.cpp
index 1a17f8705c..0e155eb021 100644
--- a/src/mathed/InsetFormulaMacro.cpp
+++ b/src/mathed/InsetFormulaMacro.cpp
@@ -16,12 +16,12 @@
 #include "MathMacroTemplate.h"
 
 #include "BufferView.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "debug.h"
 #include "gettext.h"
 #include "LColor.h"
-#include "lyxlex.h"
-#include "outputparams.h"
+#include "LyXLex.h"
+#include "OutputParams.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
diff --git a/src/mathed/InsetMathAMSArray.cpp b/src/mathed/InsetMathAMSArray.cpp
index 67098ed64c..436eb23d70 100644
--- a/src/mathed/InsetMathAMSArray.cpp
+++ b/src/mathed/InsetMathAMSArray.cpp
@@ -17,7 +17,7 @@
 #include "MathStream.h"
 #include "MathSupport.h"
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
 
diff --git a/src/mathed/InsetMathCases.cpp b/src/mathed/InsetMathCases.cpp
index 64a1d48bd6..4edc6e8125 100644
--- a/src/mathed/InsetMathCases.cpp
+++ b/src/mathed/InsetMathCases.cpp
@@ -17,10 +17,10 @@
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
 #include "support/std_ostream.h"
-#include "cursor.h"
-#include "funcrequest.h"
+#include "LCursor.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "undo.h"
+#include "Undo.h"
 
 #include "support/lstrings.h"
 
diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp
index 0baad6a7d5..347b82da21 100644
--- a/src/mathed/InsetMathChar.cpp
+++ b/src/mathed/InsetMathChar.cpp
@@ -16,7 +16,7 @@
 #include "MathStream.h"
 
 #include "debug.h"
-#include "dimension.h"
+#include "Dimension.h"
 #include "support/lstrings.h"
 #include "TextPainter.h"
 
diff --git a/src/mathed/InsetMathChar.h b/src/mathed/InsetMathChar.h
index 1a28af248a..347e8533f6 100644
--- a/src/mathed/InsetMathChar.h
+++ b/src/mathed/InsetMathChar.h
@@ -14,7 +14,7 @@
 
 #include "InsetMath.h"
 
-#include "lyxfont.h"
+#include "LyXFont.h"
 
 namespace lyx {
 
diff --git a/src/mathed/InsetMathDim.cpp b/src/mathed/InsetMathDim.cpp
index e74bbbc2c6..782a74700b 100644
--- a/src/mathed/InsetMathDim.cpp
+++ b/src/mathed/InsetMathDim.cpp
@@ -13,9 +13,9 @@
 #include "InsetMathDim.h"
 
 #include "BufferView.h"
-#include "coordcache.h"
+#include "CoordCache.h"
 #include "debug.h"
-#include "metricsinfo.h"
+#include "MetricsInfo.h"
 
 
 namespace lyx {
diff --git a/src/mathed/InsetMathFracBase.cpp b/src/mathed/InsetMathFracBase.cpp
index 82e53915a1..eb997089dc 100644
--- a/src/mathed/InsetMathFracBase.cpp
+++ b/src/mathed/InsetMathFracBase.cpp
@@ -12,7 +12,7 @@
 
 #include "InsetMathFracBase.h"
 #include "MathArray.h"
-#include "cursor.h"
+#include "LCursor.h"
 
 
 namespace lyx {
diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp
index 336fbedccf..5811ec8703 100644
--- a/src/mathed/InsetMathGrid.cpp
+++ b/src/mathed/InsetMathGrid.cpp
@@ -19,11 +19,11 @@
 #include "CutAndPaste.h"
 #include "FuncStatus.h"
 #include "LColor.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "undo.h"
+#include "Undo.h"
 
 #include "frontends/Clipboard.h"
 #include "frontends/Painter.h"
diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index 92fa683ff5..85204ea796 100644
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -13,7 +13,7 @@
 #define MATH_GRID_H
 
 #include "InsetMathNest.h"
-#include "lyxlength.h"
+#include "LyXLength.h"
 
 
 namespace lyx {
diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index d21174ce44..1f6972fa99 100644
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -26,25 +26,25 @@
 #include "InsetMathRef.h"
 
 #include "bufferview_funcs.h"
-#include "lyxtext.h"
+#include "LyXText.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
 #include "CutAndPaste.h"
 #include "FuncStatus.h"
 #include "LColor.h"
 #include "LaTeXFeatures.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "lyxrc.h"
-#include "outputparams.h"
+#include "LyXRC.h"
+#include "OutputParams.h"
 #include "sgml.h"
 #include "TextPainter.h"
-#include "undo.h"
+#include "Undo.h"
 
 #include "insets/RenderPreview.h"
 #include "insets/InsetLabel.h"
diff --git a/src/mathed/InsetMathKern.cpp b/src/mathed/InsetMathKern.cpp
index c5cab3ec30..f4e2afda2d 100644
--- a/src/mathed/InsetMathKern.cpp
+++ b/src/mathed/InsetMathKern.cpp
@@ -14,7 +14,7 @@
 #include "MathStream.h"
 #include "MathStream.h"
 #include "MathSupport.h"
-#include "dimension.h"
+#include "Dimension.h"
 
 
 namespace lyx {
diff --git a/src/mathed/InsetMathKern.h b/src/mathed/InsetMathKern.h
index 04a5e49bef..0f0d99e798 100644
--- a/src/mathed/InsetMathKern.h
+++ b/src/mathed/InsetMathKern.h
@@ -13,7 +13,7 @@
 #define MATH_CHEATINSET_H
 
 #include "InsetMath.h"
-#include "lyxlength.h"
+#include "LyXLength.h"
 
 
 namespace lyx {
diff --git a/src/mathed/InsetMathMBox.cpp b/src/mathed/InsetMathMBox.cpp
index adb16c5498..ce241ff6cf 100644
--- a/src/mathed/InsetMathMBox.cpp
+++ b/src/mathed/InsetMathMBox.cpp
@@ -15,15 +15,15 @@
 #include "MathStream.h"
 
 #include "BufferView.h"
-#include "buffer.h"
-#include "bufferparams.h"
-#include "cursor.h"
+#include "Buffer.h"
+#include "BufferParams.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "metricsinfo.h"
+#include "MetricsInfo.h"
 #include "output_latex.h"
-#include "outputparams.h"
-#include "paragraph.h"
-#include "texrow.h"
+#include "OutputParams.h"
+#include "Paragraph.h"
+#include "TexRow.h"
 #include "TextMetrics.h"
 
 namespace lyx {
diff --git a/src/mathed/InsetMathMBox.h b/src/mathed/InsetMathMBox.h
index a3ee6fbfd4..2a07751796 100644
--- a/src/mathed/InsetMathMBox.h
+++ b/src/mathed/InsetMathMBox.h
@@ -17,7 +17,7 @@
 #define MATH_MBOXINSET_H
 
 #include "InsetMathDim.h"
-#include "lyxtext.h"
+#include "LyXText.h"
 
 
 namespace lyx {
diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index 526a9c880f..a4429bd22c 100644
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -38,15 +38,15 @@
 #include "FuncStatus.h"
 #include "LColor.h"
 #include "bufferview_funcs.h"
-#include "coordcache.h"
-#include "cursor.h"
+#include "CoordCache.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "lyxtext.h"
-#include "outputparams.h"
-#include "undo.h"
+#include "LyXText.h"
+#include "OutputParams.h"
+#include "Undo.h"
 
 #include "support/lstrings.h"
 #include "support/textutils.h"
@@ -55,9 +55,9 @@
 #include "frontends/Painter.h"
 #include "frontends/Selection.h"
 
-#include "funcrequest.h"
-#include "lyxserver.h"
-#include "lyxsocket.h"
+#include "FuncRequest.h"
+#include "LyXServer.h"
+#include "LyXServerSocket.h"
 
 #include <sstream>
 
diff --git a/src/mathed/InsetMathOverset.cpp b/src/mathed/InsetMathOverset.cpp
index a2a6ecd2b6..1c7b2fd7fb 100644
--- a/src/mathed/InsetMathOverset.cpp
+++ b/src/mathed/InsetMathOverset.cpp
@@ -14,7 +14,7 @@
 #include "MathArray.h"
 #include "MathStream.h"
 
-#include "cursor.h"
+#include "LCursor.h"
 #include "LaTeXFeatures.h"
 
 
diff --git a/src/mathed/InsetMathRef.cpp b/src/mathed/InsetMathRef.cpp
index 9864fc390a..008e976f2a 100644
--- a/src/mathed/InsetMathRef.cpp
+++ b/src/mathed/InsetMathRef.cpp
@@ -14,16 +14,16 @@
 
 #include "BufferView.h"
 #include "LaTeXFeatures.h"
-#include "buffer.h"
-#include "cursor.h"
+#include "Buffer.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "MathArray.h"
 #include "MathFactory.h"
 #include "MathSupport.h"
-#include "outputparams.h"
+#include "OutputParams.h"
 #include "sgml.h"
 
 #include "insets/InsetCommand.h"
diff --git a/src/mathed/InsetMathRoot.cpp b/src/mathed/InsetMathRoot.cpp
index eb791c343a..1e954131b5 100644
--- a/src/mathed/InsetMathRoot.cpp
+++ b/src/mathed/InsetMathRoot.cpp
@@ -14,7 +14,7 @@
 #include "InsetMathRoot.h"
 #include "MathArray.h"
 #include "MathStream.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "LColor.h"
 
 #include "frontends/Painter.h"
diff --git a/src/mathed/InsetMathScript.cpp b/src/mathed/InsetMathScript.cpp
index fa6046a715..ba070aeba6 100644
--- a/src/mathed/InsetMathScript.cpp
+++ b/src/mathed/InsetMathScript.cpp
@@ -16,11 +16,11 @@
 #include "MathSupport.h"
 #include "InsetMathSymbol.h"
 #include "InsetMathFont.h"
-#include "dispatchresult.h"
-#include "cursor.h"
+#include "DispatchResult.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "funcrequest.h"
-#include "undo.h"
+#include "FuncRequest.h"
+#include "Undo.h"
 
 #include <boost/assert.hpp>
 
diff --git a/src/mathed/InsetMathSize.h b/src/mathed/InsetMathSize.h
index f749e3ef5c..d71c3b2356 100644
--- a/src/mathed/InsetMathSize.h
+++ b/src/mathed/InsetMathSize.h
@@ -13,7 +13,7 @@
 #define MATHSIZEINSET_H
 
 #include "InsetMathNest.h"
-#include "metricsinfo.h"
+#include "MetricsInfo.h"
 
 
 namespace lyx {
diff --git a/src/mathed/InsetMathSplit.cpp b/src/mathed/InsetMathSplit.cpp
index 1a668b6fc4..6f0092c138 100644
--- a/src/mathed/InsetMathSplit.cpp
+++ b/src/mathed/InsetMathSplit.cpp
@@ -15,7 +15,7 @@
 #include "MathStream.h"
 #include "MathStream.h"
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
diff --git a/src/mathed/InsetMathSubstack.cpp b/src/mathed/InsetMathSubstack.cpp
index 24663ac447..b2260a40cb 100644
--- a/src/mathed/InsetMathSubstack.cpp
+++ b/src/mathed/InsetMathSubstack.cpp
@@ -16,7 +16,7 @@
 #include "MathStream.h"
 #include "support/std_ostream.h"
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "gettext.h"
 
diff --git a/src/mathed/InsetMathSymbol.cpp b/src/mathed/InsetMathSymbol.cpp
index 87aff39550..143caf84c5 100644
--- a/src/mathed/InsetMathSymbol.cpp
+++ b/src/mathed/InsetMathSymbol.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathSymbol.h"
-#include "dimension.h"
+#include "Dimension.h"
 #include "MathStream.h"
 #include "MathStream.h"
 #include "MathSupport.h"
diff --git a/src/mathed/InsetMathSymbol.h b/src/mathed/InsetMathSymbol.h
index 74b0b9180f..9a1e9ac897 100644
--- a/src/mathed/InsetMathSymbol.h
+++ b/src/mathed/InsetMathSymbol.h
@@ -14,7 +14,7 @@
 
 #include "InsetMath.h"
 
-#include "lyxfont.h"
+#include "LyXFont.h"
 
 namespace lyx {
 
diff --git a/src/mathed/InsetMathUnderset.cpp b/src/mathed/InsetMathUnderset.cpp
index 130e86d01f..c05c759ae6 100644
--- a/src/mathed/InsetMathUnderset.cpp
+++ b/src/mathed/InsetMathUnderset.cpp
@@ -14,7 +14,7 @@
 #include "MathArray.h"
 #include "MathStream.h"
 
-#include "cursor.h"
+#include "LCursor.h"
 #include "LaTeXFeatures.h"
 
 
diff --git a/src/mathed/InsetMathXYArrow.h b/src/mathed/InsetMathXYArrow.h
index 334b8f58cb..041bf080a7 100644
--- a/src/mathed/InsetMathXYArrow.h
+++ b/src/mathed/InsetMathXYArrow.h
@@ -13,7 +13,7 @@
 #define MATH_ARROWINSET_H
 
 #include "InsetMathNest.h"
-#include "metricsinfo.h"
+#include "MetricsInfo.h"
 
 
 namespace lyx {
diff --git a/src/mathed/InsetMathXYMatrix.h b/src/mathed/InsetMathXYMatrix.h
index 949f488f94..797b9f19bb 100644
--- a/src/mathed/InsetMathXYMatrix.h
+++ b/src/mathed/InsetMathXYMatrix.h
@@ -12,7 +12,7 @@
 #ifndef MATH_XYMATRIX_H
 #define MATH_XYMATRIX_H
 
-#include "lyxlength.h"
+#include "LyXLength.h"
 #include "InsetMathGrid.h"
 
 
diff --git a/src/mathed/MathArray.cpp b/src/mathed/MathArray.cpp
index 805f8b5495..de972e4096 100644
--- a/src/mathed/MathArray.cpp
+++ b/src/mathed/MathArray.cpp
@@ -20,8 +20,8 @@
 #include "ReplaceData.h"
 
 #include "BufferView.h"
-#include "buffer.h"
-#include "cursor.h"
+#include "Buffer.h"
+#include "LCursor.h"
 #include "debug.h"
 #include "LColor.h"
 
diff --git a/src/mathed/MathArray.h b/src/mathed/MathArray.h
index 5582a46828..2001ec90d9 100644
--- a/src/mathed/MathArray.h
+++ b/src/mathed/MathArray.h
@@ -17,7 +17,7 @@
 #include <vector>
 
 #include "MathAtom.h"
-#include "dimension.h"
+#include "Dimension.h"
 
 #include "support/docstream.h"
 
diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index 1cde0ecfd8..bf9afad0ea 100644
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -16,8 +16,8 @@
 #include "MathExtern.h"
 #include "MathStream.h"
 
-#include "buffer.h"
-#include "cursor.h"
+#include "Buffer.h"
+#include "LCursor.h"
 #include "debug.h"
 #include "BufferView.h"
 #include "LaTeXFeatures.h"
diff --git a/src/mathed/MathMacroTable.cpp b/src/mathed/MathMacroTable.cpp
index 779dc10625..2cc7c8fcd8 100644
--- a/src/mathed/MathMacroTable.cpp
+++ b/src/mathed/MathMacroTable.cpp
@@ -17,7 +17,7 @@
 #include "InsetMathSqrt.h"
 
 #include "debug.h"
-#include "dociterator.h"
+#include "DocIterator.h"
 
 #include <boost/assert.hpp>
 
diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp
index 24cb74a725..1c21beb5c6 100644
--- a/src/mathed/MathMacroTemplate.cpp
+++ b/src/mathed/MathMacroTemplate.cpp
@@ -15,10 +15,10 @@
 #include "MathParser.h"
 #include "MathSupport.h"
 
-#include "cursor.h"
+#include "LCursor.h"
 #include "debug.h"
 #include "gettext.h"
-#include "lyxlex.h"
+#include "LyXLex.h"
 #include "LColor.h"
 
 #include "frontends/FontMetrics.h"
diff --git a/src/mathed/MathParser.cpp b/src/mathed/MathParser.cpp
index 05775dc795..1586b95a9e 100644
--- a/src/mathed/MathParser.cpp
+++ b/src/mathed/MathParser.cpp
@@ -62,7 +62,7 @@ following hack as starting point to write some macros:
 #include "MathMacroArgument.h"
 #include "MathSupport.h"
 
-#include "lyxlex.h"
+#include "LyXLex.h"
 #include "debug.h"
 
 #include "support/convert.h"
diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index 9088db2991..2262ad9df8 100644
--- a/src/mathed/MathStream.h
+++ b/src/mathed/MathStream.h
@@ -17,7 +17,7 @@
 // settled.
 
 
-#include "metricsinfo.h"
+#include "MetricsInfo.h"
 #include "support/docstream.h"
 #include "support/docstring.h"
 
diff --git a/src/messages.C b/src/messages.C
index b93ab6d1c7..5fbd3ccbb2 100644
--- a/src/messages.C
+++ b/src/messages.C
@@ -1,4 +1,4 @@
-/* \file messages.C
+/* \file Messages.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,7 +9,7 @@
 
 #include <config.h>
 
-#include "messages.h"
+#include "Messages.h"
 
 #include "debug.h"
 
diff --git a/src/messages.h b/src/messages.h
index 87ebb4025d..801086f194 100644
--- a/src/messages.h
+++ b/src/messages.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* \file messages.h
+/* \file Messages.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -40,10 +40,10 @@ private:
 };
 
 /// Access to the unique Messages object for the passed \p language.
-/// Implementation is in lyx_main.C.
+/// Implementation is in LyX.cpp.
 extern Messages & getMessages(std::string const & language);
 /// Access to the unique Messages object used for GUI element.
-/// Implementation is in lyx_main.C.
+/// Implementation is in LyX.cpp.
 extern Messages & getGuiMessages();
 
 } // namespace lyx
diff --git a/src/metricsinfo.C b/src/metricsinfo.C
index 9544e68883..679dd91904 100644
--- a/src/metricsinfo.C
+++ b/src/metricsinfo.C
@@ -1,5 +1,5 @@
 /**
- * \file metricsinfo.C
+ * \file MetricsInfo.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 
 #include "BufferView.h"
 #include "LColor.h"
-#include "metricsinfo.h"
+#include "MetricsInfo.h"
 
 #include "mathed/MathSupport.h"
 
diff --git a/src/metricsinfo.h b/src/metricsinfo.h
index 733bccd3f2..a0fa162384 100644
--- a/src/metricsinfo.h
+++ b/src/metricsinfo.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file metricsinfo.h
+ * \file MetricsInfo.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef METRICSINFO_H
 #define METRICSINFO_H
 
-#include "lyxfont.h"
+#include "LyXFont.h"
 #include "support/docstring.h"
 #include <string>
 
diff --git a/src/mover.C b/src/mover.C
index 6fb9daf06c..e0e41b837a 100644
--- a/src/mover.C
+++ b/src/mover.C
@@ -1,5 +1,5 @@
 /**
- * \file mover.C
+ * \file Mover.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "mover.h"
+#include "Mover.h"
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
diff --git a/src/mover.h b/src/mover.h
index b370b03916..c07eeb3ee8 100644
--- a/src/mover.h
+++ b/src/mover.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file mover.h
+ * \file Mover.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/output.C b/src/output.C
index 7b19e0b091..4e0890db19 100644
--- a/src/output.C
+++ b/src/output.C
@@ -1,5 +1,5 @@
 /**
- * \file output.C
+ * \file output.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/output_docbook.C b/src/output_docbook.C
index 233fd42ef4..10d15e1a13 100644
--- a/src/output_docbook.C
+++ b/src/output_docbook.C
@@ -1,5 +1,5 @@
 /**
- * \file output_docbook.C
+ * \file output_docbook.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,13 +13,13 @@
 
 #include "output_docbook.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "buffer_funcs.h"
-#include "bufferparams.h"
-#include "outputparams.h"
-#include "counters.h"
+#include "BufferParams.h"
+#include "OutputParams.h"
+#include "Counters.h"
 #include "debug.h"
-#include "paragraph.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphList.h"
 #include "ParagraphParameters.h"
diff --git a/src/output_latex.C b/src/output_latex.C
index 0c8a07cbb2..4ff83566f7 100644
--- a/src/output_latex.C
+++ b/src/output_latex.C
@@ -1,5 +1,5 @@
 /**
- * \file output_latex.C
+ * \file output_latex.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,18 +12,18 @@
 
 #include "output_latex.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "debug.h"
-#include "encoding.h"
-#include "language.h"
-#include "lyxrc.h"
-#include "outputparams.h"
-#include "paragraph.h"
+#include "Encoding.h"
+#include "Language.h"
+#include "LyXRC.h"
+#include "OutputParams.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
-#include "texrow.h"
-#include "vspace.h"
+#include "TexRow.h"
+#include "VSpace.h"
 
 #include "insets/InsetBibitem.h"
 #include "insets/InsetOptArg.h"
diff --git a/src/output_plaintext.C b/src/output_plaintext.C
index 97346cec11..0bbd748856 100644
--- a/src/output_plaintext.C
+++ b/src/output_plaintext.C
@@ -1,5 +1,5 @@
 /**
- * \file output_plaintext.C
+ * \file output_plaintext.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,13 +12,13 @@
 
 #include "output_plaintext.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "debug.h"
 #include "gettext.h"
 #include "output.h"
-#include "outputparams.h"
-#include "paragraph.h"
+#include "OutputParams.h"
+#include "Paragraph.h"
 #include "ParagraphList.h"
 #include "ParagraphParameters.h"
 
diff --git a/src/outputparams.C b/src/outputparams.C
index 9604f38f6d..4322ace9f8 100644
--- a/src/outputparams.C
+++ b/src/outputparams.C
@@ -1,5 +1,5 @@
 /**
- * \file outputparams.C
+ * \file OutputParams.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "outputparams.h"
-#include "exporter.h"
+#include "OutputParams.h"
+#include "Exporter.h"
 
 
 namespace lyx {
diff --git a/src/outputparams.h b/src/outputparams.h
index fa9b98cdf0..fd2894fa2e 100644
--- a/src/outputparams.h
+++ b/src/outputparams.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file outputparams.h
+ * \file OutputParams.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/paragraph.C b/src/paragraph.C
index 6cf4e2380a..232515060e 100644
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -1,5 +1,5 @@
 /**
- * \file paragraph.C
+ * \file Paragraph.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -17,30 +17,30 @@
 
 #include <config.h>
 
-#include "paragraph.h"
+#include "Paragraph.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
-#include "counters.h"
-#include "encoding.h"
+#include "Buffer.h"
+#include "BufferParams.h"
+#include "Counters.h"
+#include "Encoding.h"
 #include "debug.h"
 #include "gettext.h"
-#include "language.h"
+#include "Language.h"
 #include "LaTeXFeatures.h"
 #include "LColor.h"
-#include "lyxlength.h"
-#include "lyxfont.h"
-#include "lyxrc.h"
-#include "lyxrow.h"
-#include "messages.h"
-#include "outputparams.h"
+#include "LyXLength.h"
+#include "LyXFont.h"
+#include "LyXRC.h"
+#include "Row.h"
+#include "Messages.h"
+#include "OutputParams.h"
 #include "output_latex.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "rowpainter.h"
 #include "sgml.h"
-#include "texrow.h"
-#include "vspace.h"
+#include "TexRow.h"
+#include "VSpace.h"
 
 #include "frontends/FontMetrics.h"
 
@@ -1330,7 +1330,7 @@ LyXFont const Paragraph::getFirstFontSettings(BufferParams const & bparams) cons
 
 
 // Gets the fully instantiated font at a given position in a paragraph
-// This is basically the same function as LyXText::GetFont() in text2.C.
+// This is basically the same function as LyXText::GetFont() in text2.cpp.
 // The difference is that this one is used for generating the LaTeX file,
 // and thus cosmetic "improvements" are disallowed: This has to deliver
 // the true picture of the buffer. (Asger)
@@ -1461,7 +1461,7 @@ void Paragraph::setFont(pos_type pos, LyXFont const & font)
 	BOOST_ASSERT(pos <= size());
 
 	// First, reduce font against layout/label font
-	// Update: The setCharFont() routine in text2.C already
+	// Update: The setCharFont() routine in text2.cpp already
 	// reduces font, so we don't need to do that here. (Asger)
 	// No need to simplify this because it will disappear
 	// in a new kernel. (Asger)
diff --git a/src/paragraph.h b/src/paragraph.h
index 5d1658c7d0..2d8ad9fe6c 100644
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file paragraph.h
+ * \file Paragraph.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,8 +16,8 @@
 #ifndef PARAGRAPH_H
 #define PARAGRAPH_H
 
-#include "changes.h"
-#include "dimension.h"
+#include "Changes.h"
+#include "Dimension.h"
 #include "InsetList.h"
 #include "lyxlayout_ptr_fwd.h"
 #include "RowList_fwd.h"
diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 76c99d685f..d5f1fe240c 100644
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -1,5 +1,5 @@
 /**
- * \file paragraph_funcs.C
+ * \file paragraph_funcs.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,10 +12,10 @@
 
 #include "paragraph_funcs.h"
 
-#include "bufferparams.h"
+#include "BufferParams.h"
 #include "debug.h"
-#include "lyxtext.h"
-#include "paragraph.h"
+#include "LyXText.h"
+#include "Paragraph.h"
 #include "ParagraphParameters.h"
 
 
diff --git a/src/pariterator.C b/src/pariterator.C
index ee5e07fd99..aee7022b82 100644
--- a/src/pariterator.C
+++ b/src/pariterator.C
@@ -1,4 +1,4 @@
-/* \file pariterator.C
+/* \file ParIterator.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-#include "pariterator.h"
+#include "ParIterator.h"
 
-#include "paragraph.h"
-#include "lyxtext.h"
+#include "Paragraph.h"
+#include "LyXText.h"
 
 #include "insets/Inset.h"
 
diff --git a/src/pariterator.h b/src/pariterator.h
index 9f4884184e..bcae0b96e8 100644
--- a/src/pariterator.h
+++ b/src/pariterator.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* \file pariterator.h
+/* \file ParIterator.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef PARITERATOR_H
 #define PARITERATOR_H
 
-#include "dociterator.h"
+#include "DocIterator.h"
 #include "ParagraphList_fwd.h"
 
 #include "support/types.h"
@@ -58,7 +58,7 @@ public:
 	ParIterator & operator++();
 	///
 	ParIterator operator++(int);
-	/// See comment in pariterator.C
+	/// See comment in ParIterator.cpp
 	//ParIterator & operator--();
 	///
 	Paragraph & operator*() const;
diff --git a/src/pspell.C b/src/pspell.C
index b0a46fedc0..3d5f043dcf 100644
--- a/src/pspell.C
+++ b/src/pspell.C
@@ -1,5 +1,5 @@
 /**
- * \file pspell.C
+ * \file PSpell.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,10 +16,10 @@
 #define USE_ORIGINAL_MANAGER_FUNCS 1
 // new aspell pspell missing extern "C"
 extern "C" {
-#include <pspell/pspell.h>
+#include <pspell/PSpell.h>
 }
 
-#include "pspell.h"
+#include "PSpell.h"
 #include "WordLangTuple.h"
 
 #include <boost/assert.hpp>
diff --git a/src/pspell.h b/src/pspell.h
index 44071dc3e1..6e9d383987 100644
--- a/src/pspell.h
+++ b/src/pspell.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file pspell.h
+ * \file PSpell.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/rowpainter.C b/src/rowpainter.C
index f6b572e7e7..74bc9242d0 100644
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -1,5 +1,5 @@
 /**
- * \file rowpainter.C
+ * \file rowpainter.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,25 +13,25 @@
 
 #include "rowpainter.h"
 
-#include "buffer.h"
-#include "coordcache.h"
-#include "cursor.h"
+#include "Buffer.h"
+#include "CoordCache.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "bufferparams.h"
+#include "BufferParams.h"
 #include "BufferView.h"
-#include "encoding.h"
+#include "Encoding.h"
 #include "gettext.h"
-#include "language.h"
+#include "Language.h"
 #include "LColor.h"
-#include "lyxrc.h"
-#include "lyxrow.h"
-#include "metricsinfo.h"
-#include "paragraph.h"
+#include "LyXRC.h"
+#include "Row.h"
+#include "MetricsInfo.h"
+#include "Paragraph.h"
 #include "ParagraphMetrics.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "TextMetrics.h"
-#include "vspace.h"
+#include "VSpace.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
diff --git a/src/session.C b/src/session.C
index d8ac631cd3..3deb393a6f 100644
--- a/src/session.C
+++ b/src/session.C
@@ -1,5 +1,5 @@
 /**
- * \file session.C
+ * \file Session.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include "session.h"
+#include "Session.h"
 #include "debug.h"
 #include "support/package.h"
 #include "support/filetools.h"
diff --git a/src/session.h b/src/session.h
index 63b9a9a03e..e395434d52 100644
--- a/src/session.h
+++ b/src/session.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file session.h
+ * \file Session.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/sgml.C b/src/sgml.C
index e5fb7fc2af..4cd238d857 100644
--- a/src/sgml.C
+++ b/src/sgml.C
@@ -1,5 +1,5 @@
 /**
- * \file sgml.C
+ * \file sgml.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,12 +13,12 @@
 
 #include "sgml.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
-#include "counters.h"
-#include "lyxtext.h"
-#include "outputparams.h"
-#include "paragraph.h"
+#include "Buffer.h"
+#include "BufferParams.h"
+#include "Counters.h"
+#include "LyXText.h"
+#include "OutputParams.h"
+#include "Paragraph.h"
 
 #include "support/docstring.h"
 #include "support/lstrings.h"
diff --git a/src/support/filetools.C b/src/support/filetools.C
index 0815d1b9c2..4c1fc196f5 100644
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -1054,7 +1054,7 @@ bool readLink(FileName const & file, FileName & link)
 cmd_ret const runCommand(string const & cmd)
 {
 	// FIXME: replace all calls to RunCommand with ForkedCall
-	// (if the output is not needed) or the code in ispell.C
+	// (if the output is not needed) or the code in ISpell.cpp
 	// (if the output is needed).
 
 	// One question is if we should use popen or
diff --git a/src/support/lyxtime.C b/src/support/lyxtime.C
index aabd1229da..908e740319 100644
--- a/src/support/lyxtime.C
+++ b/src/support/lyxtime.C
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "support/lyxtime.h"
-#include "lyxrc.h"
+#include "LyXRC.h"
 
 using std::string;
 
diff --git a/src/support/package.C.in b/src/support/package.C.in
index 2680a96279..82645706a1 100644
--- a/src/support/package.C.in
+++ b/src/support/package.C.in
@@ -80,7 +80,7 @@ void init_package(string const & command_line_arg0,
 Package const & package()
 {
 	// Commented out because package().locale_dir() can be called
-	// from the message translation code in messages.C before
+	// from the message translation code in Messages.cpp before
 	// init_package() is called. Lars is on the case...
 	// BOOST_ASSERT(initialised_);
 	return package_;
diff --git a/src/support/package.h b/src/support/package.h
index 1db12d6330..2235a31b93 100644
--- a/src/support/package.h
+++ b/src/support/package.h
@@ -119,7 +119,7 @@ public:
 
 	/** Used when setting the user_support directory.
 	 *  Used also when expanding "~/" or contracting to "~/". (filetools.C)
-	 *  Used in emergencyWrite (bufferlist.C) as one possible location
+	 *  Used in emergencyWrite (BufferList.cpp) as one possible location
 	 *  for the dump.
 	 *  This may be empty (e. g. when run under a CGI environment)
 	 */
diff --git a/src/tabular.C b/src/tabular.C
index bf6c16618f..1907389521 100644
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -1,5 +1,5 @@
 /**
- * \file tabular.C
+ * \file LyXTabular.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -17,17 +17,17 @@
 
 #include <config.h>
 
-#include "tabular.h"
+#include "LyXTabular.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "debug.h"
 #include "LaTeXFeatures.h"
-#include "lyxlex.h"
-#include "outputparams.h"
-#include "paragraph.h"
+#include "LyXLex.h"
+#include "OutputParams.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
 
 #include "insets/InsetTabular.h"
@@ -809,7 +809,7 @@ int LyXTabular::getAdditionalHeight(row_type row) const
 int LyXTabular::getAdditionalWidth(idx_type cell) const
 {
 	// internally already set in setWidthOfCell
-	// used to get it back in text.C
+	// used to get it back in text.cpp
 	col_type const col = right_column_of_cell(cell);
 	row_type const row = row_of_cell(cell);
 	if (col < columns_ - 1 && rightLine(cell) &&
diff --git a/src/tabular.h b/src/tabular.h
index d460414511..01d3cb0e15 100644
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file tabular.h
+ * \file LyXTabular.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,10 +12,10 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef TABULAR_H
-#define TABULAR_H
+#ifndef LYXTABULAR_H
+#define LYXTABULAR_H
 
-#include "lyxlength.h"
+#include "LyXLength.h"
 #include "insets/InsetText.h"
 
 #include <boost/shared_ptr.hpp>
diff --git a/src/tex-accent.C b/src/tex-accent.C
index adb9b1b365..d70aa421a7 100644
--- a/src/tex-accent.C
+++ b/src/tex-accent.C
@@ -1,5 +1,5 @@
 /**
- * \file tex-accent.C
+ * \file tex-accent.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/tex-strings.C b/src/tex-strings.C
index 59ba87f0ce..d6f9e2f6cf 100644
--- a/src/tex-strings.C
+++ b/src/tex-strings.C
@@ -1,5 +1,5 @@
 /**
- * \file tex-strings.C
+ * \file tex-strings.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index bcab5edf2d..1481063aa7 100644
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -23,14 +23,14 @@ BOOST_LIBS = $(BOOST_REGEX) $(BOOST_FILESYSTEM) $(BOOST_IOSTREAMS)
 COMPRESSIONLIB = -lz
 
 LINKED_FILES = \
-	FloatList.C \
-	Floating.C \
-	counters.C \
-	lyxlayout.h \
-	lyxlayout.C \
-	lyxtextclass.C \
-	lyxtextclass.h \
-	lyxlex.C 
+	FloatList.cpp \
+	Floating.cpp \
+	Counters.cpp \
+	LyXLayout.h \
+	LyXLayout.cpp \
+	LyXTextClass.cpp \
+	LyXTextClass.h \
+	LyXLex.cpp 
 
 BUILT_SOURCES = $(PCH_FILE) $(LINKED_FILES)
 
@@ -40,10 +40,10 @@ tex2lyx_SOURCES = \
 	boost.cpp \
 	context.C \
 	context.h \
-	gettext.C \
-	lengthcommon.C \
-	lyxfont.C \
-	lyxfont.h \
+	gettext.cpp \
+	lengthcommon.cpp \
+	LyXFont.cpp \
+	LyXFont.h \
 	texparser.C \
 	texparser.h \
 	tex2lyx.C \
@@ -51,7 +51,7 @@ tex2lyx_SOURCES = \
 	preamble.C \
 	math.C \
 	table.C \
-	text.C
+	text.cpp
 
 tex2lyx_LDADD = \
 	$(top_builddir)/src/support/libsupport.la \
diff --git a/src/tex2lyx/context.h b/src/tex2lyx/context.h
index fd71d6441b..7e795185ec 100644
--- a/src/tex2lyx/context.h
+++ b/src/tex2lyx/context.h
@@ -12,7 +12,7 @@
 #ifndef CONTEXT_H
 #define CONTEXT_H
 
-#include "lyxtextclass.h"
+#include "LyXTextClass.h"
 
 #include <iosfwd>
 
diff --git a/src/tex2lyx/gettext.C b/src/tex2lyx/gettext.C
index 5758fc1b98..43fc55d278 100644
--- a/src/tex2lyx/gettext.C
+++ b/src/tex2lyx/gettext.C
@@ -1,5 +1,5 @@
 /**
- * \file tex2lyx/gettext.C
+ * \file tex2lyx/gettext.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/tex2lyx/lengthcommon.C b/src/tex2lyx/lengthcommon.C
index f5b630a1fc..038621438b 100644
--- a/src/tex2lyx/lengthcommon.C
+++ b/src/tex2lyx/lengthcommon.C
@@ -1,10 +1,10 @@
-// This file is here sine the master lengthcommon.C contains gettext
+// This file is here sine the master lengthcommon.cpp contains gettext
 // markers, and also that this file does not always exist (in the linked
 // case). So it is possible for po/POTFILES.in to get out of sync.
 // The compile will then fail. So to make sure that this file
-//(tex2lyx/lengthcommon.C) is not present in POTFILES.in we do a
+//(tex2lyx/lengthcommon.cpp) is not present in POTFILES.in we do a
 // include trick. (Lgb)
-#include "../lengthcommon.C"
+#include "../lengthcommon.cpp"
 
 
 namespace lyx {
diff --git a/src/tex2lyx/lyxfont.C b/src/tex2lyx/lyxfont.C
index 5228079814..34bb319a98 100644
--- a/src/tex2lyx/lyxfont.C
+++ b/src/tex2lyx/lyxfont.C
@@ -1,5 +1,5 @@
 /**
- * \file tex2lyx/lyxfont.C
+ * \file tex2lyx/LyXFont.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,8 +10,8 @@
 
 #include <config.h>
 
-#include "lyxfont.h"
-#include "lyxlex.h"
+#include "LyXFont.h"
+#include "LyXLex.h"
 #include "support/lstrings.h"
 
 
diff --git a/src/tex2lyx/lyxfont.h b/src/tex2lyx/lyxfont.h
index 367641ef94..d9127e43c2 100644
--- a/src/tex2lyx/lyxfont.h
+++ b/src/tex2lyx/lyxfont.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file tex2lyx/lyxfont.h
+ * \file tex2lyx/LyXFont.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/tex2lyx/preamble.C b/src/tex2lyx/preamble.C
index acb066814a..5b1344570b 100644
--- a/src/tex2lyx/preamble.C
+++ b/src/tex2lyx/preamble.C
@@ -15,8 +15,8 @@
 #include "tex2lyx.h"
 
 #include "layout.h"
-#include "lyxtextclass.h"
-#include "lyxlex.h"
+#include "LyXTextClass.h"
+#include "LyXLex.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
@@ -159,7 +159,7 @@ void add_package(string const & name, vector<string> & options)
 	v.insert(v.end(), options.begin(), options.end());
 	if (name == "jurabib") {
 		// Don't output the order argument (see the cite command
-		// handling code in text.C).
+		// handling code in text.cpp).
 		vector<string>::iterator end =
 			remove(options.begin(), options.end(), "natbiborder");
 		end = remove(options.begin(), end, "jurabiborder");
diff --git a/src/tex2lyx/tex2lyx.C b/src/tex2lyx/tex2lyx.C
index 75339badf0..b421c1f1ed 100644
--- a/src/tex2lyx/tex2lyx.C
+++ b/src/tex2lyx/tex2lyx.C
@@ -16,7 +16,7 @@
 #include "context.h"
 
 #include "debug.h"
-#include "lyxtextclass.h"
+#include "LyXTextClass.h"
 
 #include "support/convert.h"
 #include "support/filetools.h"
diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index 1560c87d77..4452c77b79 100644
--- a/src/tex2lyx/tex2lyx.h
+++ b/src/tex2lyx/tex2lyx.h
@@ -14,7 +14,7 @@
 #define TEX2LYX_H
 
 #include "texparser.h"
-#include "lyxtextclass.h"
+#include "LyXTextClass.h"
 
 #include <iosfwd>
 #include <string>
@@ -35,7 +35,7 @@ LyXTextClass const parse_preamble(Parser & p, std::ostream & os, std::string con
 extern std::map<std::string, std::vector<std::string> > used_packages;
 
 
-/// in text.C
+/// in text.cpp
 std::string translate_len(std::string const &);
 
 void parse_text(Parser & p, std::ostream & os, unsigned flags, bool outer,
diff --git a/src/tex2lyx/text.C b/src/tex2lyx/text.C
index 6564380b04..5db0711a5c 100644
--- a/src/tex2lyx/text.C
+++ b/src/tex2lyx/text.C
@@ -1,5 +1,5 @@
 /**
- * \file tex2lyx/text.C
+ * \file tex2lyx/text.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/texrow.C b/src/texrow.C
index ee4b741094..e7165e95fa 100644
--- a/src/texrow.C
+++ b/src/texrow.C
@@ -1,5 +1,5 @@
 /**
- * \file texrow.C
+ * \file TexRow.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 
 #include <config.h>
 
-#include "texrow.h"
+#include "TexRow.h"
 #include "debug.h"
 
 #include <algorithm>
diff --git a/src/texrow.h b/src/texrow.h
index 699ee1f6f4..24a61c0730 100644
--- a/src/texrow.h
+++ b/src/texrow.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file texrow.h
+ * \file TexRow.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/text.C b/src/text.C
index e45e444533..9aab858251 100644
--- a/src/text.C
+++ b/src/text.C
@@ -1,5 +1,5 @@
 /**
- * \file src/text.C
+ * \file src/text.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,39 +16,39 @@
 
 #include <config.h>
 
-#include "lyxtext.h"
+#include "LyXText.h"
 
-#include "author.h"
-#include "buffer.h"
+#include "Author.h"
+#include "Buffer.h"
 #include "buffer_funcs.h"
-#include "bufferparams.h"
+#include "BufferParams.h"
 #include "BufferView.h"
 #include "bufferview_funcs.h"
-#include "cursor.h"
-#include "pariterator.h"
-#include "coordcache.h"
+#include "LCursor.h"
+#include "ParIterator.h"
+#include "CoordCache.h"
 #include "CutAndPaste.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "encoding.h"
-#include "errorlist.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "Encoding.h"
+#include "ErrorList.h"
+#include "FuncRequest.h"
 #include "factory.h"
 #include "FontIterator.h"
 #include "gettext.h"
-#include "language.h"
+#include "Language.h"
 #include "LColor.h"
-#include "lyxlength.h"
-#include "lyxlex.h"
-#include "lyxrc.h"
-#include "lyxrow.h"
-#include "metricsinfo.h"
-#include "paragraph.h"
+#include "LyXLength.h"
+#include "LyXLex.h"
+#include "LyXRC.h"
+#include "Row.h"
+#include "MetricsInfo.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "rowpainter.h"
-#include "undo.h"
-#include "vspace.h"
+#include "Undo.h"
+#include "VSpace.h"
 #include "WordLangTuple.h"
 
 #include "frontends/FontMetrics.h"
diff --git a/src/text2.C b/src/text2.C
index a570b387d4..99c3722c83 100644
--- a/src/text2.C
+++ b/src/text2.C
@@ -1,5 +1,5 @@
 /**
- * \file text2.C
+ * \file text2.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -19,37 +19,37 @@
 
 #include <config.h>
 
-#include "lyxtext.h"
+#include "LyXText.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "buffer_funcs.h"
-#include "bufferlist.h"
-#include "bufferparams.h"
+#include "BufferList.h"
+#include "BufferParams.h"
 #include "BufferView.h"
 #include "bufferview_funcs.h"
 #include "Bullet.h"
-#include "coordcache.h"
-#include "cursor.h"
+#include "CoordCache.h"
+#include "LCursor.h"
 #include "CutAndPaste.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "errorlist.h"
-#include "funcrequest.h"
+#include "DispatchResult.h"
+#include "ErrorList.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "language.h"
+#include "Language.h"
 #include "LColor.h"
-#include "lyxfunc.h"
-#include "lyxrc.h"
-#include "lyxrow.h"
-#include "paragraph.h"
+#include "LyXFunc.h"
+#include "LyXRC.h"
+#include "Row.h"
+#include "Paragraph.h"
 #include "TextMetrics.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
-#include "pariterator.h"
-#include "lyxserver.h"
-#include "lyxsocket.h"
-#include "undo.h"
-#include "vspace.h"
+#include "ParIterator.h"
+#include "LyXServer.h"
+#include "LyXServerSocket.h"
+#include "Undo.h"
+#include "VSpace.h"
 
 #include "frontends/FontMetrics.h"
 
@@ -139,7 +139,7 @@ InsetBase * LyXText::checkInsetHit(BufferView & bv, int x, int y)
 
 
 // Gets the fully instantiated font at a given position in a paragraph
-// Basically the same routine as Paragraph::getFont() in paragraph.C.
+// Basically the same routine as Paragraph::getFont() in Paragraph.cpp.
 // The difference is that this one is used for displaying, and thus we
 // are allowed to make cosmetic improvements. For instance make footnotes
 // smaller. (Asger)
diff --git a/src/text3.C b/src/text3.C
index e2674ad5c0..dd8169f095 100644
--- a/src/text3.C
+++ b/src/text3.C
@@ -1,5 +1,5 @@
 /**
- * \file text3.C
+ * \file text3.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,38 +15,38 @@
 
 #include <config.h>
 
-#include "lyxtext.h"
+#include "LyXText.h"
 
 #include "BranchList.h"
 #include "FloatList.h"
 #include "FuncStatus.h"
-#include "buffer.h"
+#include "Buffer.h"
 #include "buffer_funcs.h"
-#include "bufferparams.h"
+#include "BufferParams.h"
 #include "BufferView.h"
 #include "bufferview_funcs.h"
-#include "cursor.h"
-#include "coordcache.h"
+#include "LCursor.h"
+#include "CoordCache.h"
 #include "CutAndPaste.h"
 #include "debug.h"
-#include "dispatchresult.h"
-#include "errorlist.h"
+#include "DispatchResult.h"
+#include "ErrorList.h"
 #include "factory.h"
-#include "funcrequest.h"
+#include "FuncRequest.h"
 #include "gettext.h"
-#include "intl.h"
-#include "language.h"
+#include "Intl.h"
+#include "Language.h"
 #include "LyXAction.h"
-#include "lyxfunc.h"
-#include "lyxlex.h"
-#include "lyxrc.h"
-#include "lyxrow.h"
-#include "paragraph.h"
+#include "LyXFunc.h"
+#include "LyXLex.h"
+#include "LyXRC.h"
+#include "Row.h"
+#include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
-#include "undo.h"
-#include "vspace.h"
-#include "pariterator.h"
+#include "Undo.h"
+#include "VSpace.h"
+#include "ParIterator.h"
 
 #include "frontends/Clipboard.h"
 #include "frontends/Selection.h"
diff --git a/src/toc.C b/src/toc.C
index ac0c5b4306..2af427cadb 100644
--- a/src/toc.C
+++ b/src/toc.C
@@ -1,5 +1,5 @@
 /**
- * \file toc.C
+ * \file toc.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,16 +14,16 @@
 
 #include "toc.h"
 
-#include "buffer.h"
-#include "bufferparams.h"
-#include "funcrequest.h"
-#include "lyxtext.h"
+#include "Buffer.h"
+#include "BufferParams.h"
+#include "FuncRequest.h"
+#include "LyXText.h"
 #include "LyXAction.h"
-#include "paragraph.h"
-#include "pariterator.h"
-#include "cursor.h"
+#include "Paragraph.h"
+#include "ParIterator.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "undo.h"
+#include "Undo.h"
 
 
 namespace lyx {
diff --git a/src/trans.C b/src/trans.C
index 9b0433afcb..4f2b714ba9 100644
--- a/src/trans.C
+++ b/src/trans.C
@@ -1,5 +1,5 @@
 /**
- * \file trans.C
+ * \file Trans.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,12 +11,12 @@
 
 #include <config.h>
 
-#include "trans.h"
+#include "Trans.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "lyxlex.h"
+#include "LyXLex.h"
 #include "debug.h"
-#include "trans_mgr.h"
+#include "TransState.h"
 
 
 namespace lyx {
diff --git a/src/trans.h b/src/trans.h
index 2db65e41c0..4c9963cfd9 100644
--- a/src/trans.h
+++ b/src/trans.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file trans.h
+ * \file Trans.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,7 +14,7 @@
 #ifndef TRANS_H
 #define TRANS_H
 
-#include "trans_decl.h"
+#include "KmodInfo.h"
 
 #include <map>
 
diff --git a/src/trans_decl.h b/src/trans_decl.h
index f3704ab3d0..dc7839b722 100644
--- a/src/trans_decl.h
+++ b/src/trans_decl.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file trans_decl.h
+ * \file KmodInfo.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,8 +10,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef TRANS_DECL_H
-#define TRANS_DECL_H
+#ifndef KMODINFO_H
+#define KMODINFO_H
 
 #include "tex-accent.h"
 
diff --git a/src/trans_mgr.C b/src/trans_mgr.C
index 50ebf0b732..236ea2eab3 100644
--- a/src/trans_mgr.C
+++ b/src/trans_mgr.C
@@ -1,5 +1,5 @@
 /**
- * \file trans_mgr.C
+ * \file TransState.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,16 +11,16 @@
 
 #include <config.h>
 
-#include "trans_mgr.h"
+#include "TransState.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "BufferView.h"
 #include "CutAndPaste.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "debug.h"
-#include "lyxrc.h"
-#include "lyxtext.h"
-#include "trans.h"
+#include "LyXRC.h"
+#include "LyXText.h"
+#include "Trans.h"
 
 #include "support/lstrings.h"
 
diff --git a/src/trans_mgr.h b/src/trans_mgr.h
index b26fa10931..22b966e9a1 100644
--- a/src/trans_mgr.h
+++ b/src/trans_mgr.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file trans_mgr.h
+ * \file TransState.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,7 +14,7 @@
 #ifndef TRANS_MANAGER_H
 #define TRANS_MANAGER_H
 
-#include "trans_decl.h"
+#include "KmodInfo.h"
 
 #include <boost/scoped_ptr.hpp>
 
diff --git a/src/undo.C b/src/undo.C
index 4344ceeb09..07f69e1080 100644
--- a/src/undo.C
+++ b/src/undo.C
@@ -1,5 +1,5 @@
 /**
- * \file undo.C
+ * \file Undo.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,15 +14,15 @@
 
 #include <config.h>
 
-#include "undo.h"
+#include "Undo.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "buffer_funcs.h"
-#include "cursor.h"
+#include "LCursor.h"
 #include "debug.h"
 #include "BufferView.h"
-#include "lyxtext.h"
-#include "paragraph.h"
+#include "LyXText.h"
+#include "Paragraph.h"
 #include "ParagraphList.h"
 
 #include "mathed/MathSupport.h"
diff --git a/src/undo.h b/src/undo.h
index 54f76ae523..6569d75d66 100644
--- a/src/undo.h
+++ b/src/undo.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file undo.h
+ * \file Undo.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,8 +16,8 @@
 #ifndef UNDO_H
 #define UNDO_H
 
-#include "dociterator.h"
-#include "bufferparams.h"
+#include "DocIterator.h"
+#include "BufferParams.h"
 #include "ParagraphList_fwd.h"
 
 #include "support/types.h"
diff --git a/src/vc-backend.C b/src/vc-backend.C
index e7ac9d7826..91c4fc2253 100644
--- a/src/vc-backend.C
+++ b/src/vc-backend.C
@@ -1,5 +1,5 @@
 /**
- * \file vc-backend.C
+ * \file VCBackend.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,9 +10,9 @@
 
 #include <config.h>
 
-#include "vc-backend.h"
+#include "VCBackend.h"
 #include "debug.h"
-#include "buffer.h"
+#include "Buffer.h"
 
 #include "support/path.h"
 #include "support/filetools.h"
diff --git a/src/vc-backend.h b/src/vc-backend.h
index ada1107f7e..9d9f1c9b47 100644
--- a/src/vc-backend.h
+++ b/src/vc-backend.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file vc-backend.h
+ * \file VCBackend.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/vspace.C b/src/vspace.C
index c1fdbf71ad..e88833e2f4 100644
--- a/src/vspace.C
+++ b/src/vspace.C
@@ -1,5 +1,5 @@
 /**
- * \file vspace.C
+ * \file VSpace.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,13 +10,13 @@
 
 #include <config.h>
 
-#include "vspace.h"
-#include "buffer.h"
-#include "bufferparams.h"
+#include "VSpace.h"
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
 #include "gettext.h"
 #include "lengthcommon.h"
-#include "lyxtext.h"
+#include "LyXText.h"
 
 #include "support/convert.h"
 #include "support/lstrings.h"
diff --git a/src/vspace.h b/src/vspace.h
index b358b40621..03f91520e2 100644
--- a/src/vspace.h
+++ b/src/vspace.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file vspace.h
+ * \file VSpace.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 #ifndef VSPACE_H
 #define VSPACE_H
 
-#include "lyxgluelength.h"
+#include "LyXGlueLength.h"
 
 
 namespace lyx {