diff --git a/eeschema/eelibs_read_libraryfiles.cpp b/eeschema/eelibs_read_libraryfiles.cpp
index 9f468fe106..5f4bbe0ad8 100644
--- a/eeschema/eelibs_read_libraryfiles.cpp
+++ b/eeschema/eelibs_read_libraryfiles.cpp
@@ -1,6 +1,7 @@
-/*****************************************************************/
-/*  Functions to handle component library files : read functions */
-/*****************************************************************/
+/**
+ * @file eelibs_read_libraryfiles.cpp
+ * @brief Functions to handle reading component library files.
+ */
 
 #include "fctsys.h"
 #include "confirm.h"
@@ -14,11 +15,6 @@
 #include "html_messagebox.h"
 
 
-/**
- * Function LoadLibraries
- *
- * Clear all already loaded libraries and load all of the project libraries.
- */
 void SCH_EDIT_FRAME::LoadLibraries( void )
 {
     size_t         ii;
@@ -47,7 +43,8 @@ void SCH_EDIT_FRAME::LoadLibraries( void )
     /* Load missing libraries. */
     for( ii = 0; ii < m_ComponentLibFiles.GetCount(); ii++ )
     {
-        fn = m_ComponentLibFiles[ii];
+        fn.Clear();
+        fn.SetName( m_ComponentLibFiles[ii] );
         fn.SetExt( CompLibFileExtension );
 
         /* Skip if the file name is not valid.. */
@@ -57,6 +54,7 @@ void SCH_EDIT_FRAME::LoadLibraries( void )
         if( !fn.FileExists() )
         {
             tmp = wxGetApp().FindLibraryPath( fn );
+
             if( !tmp )
             {
                 libraries_not_found += fn.GetName() + _( "\n" );
@@ -109,13 +107,14 @@ void SCH_EDIT_FRAME::LoadLibraries( void )
     wxLogDebug( wxT( "LoadLibraries() requested component library sort order:" ) );
 
     for( size_t i = 0; i < sortOrder.GetCount(); i++ )
-        wxLogDebug( wxT( "    " ) + sortOrder[i] );
+         wxLogDebug( wxT( "    " ) + sortOrder[i] );
 
     wxLogDebug( wxT( "Real component library sort order:" ) );
 
     for ( i = CMP_LIBRARY::GetLibraryList().begin();
           i < CMP_LIBRARY::GetLibraryList().end(); i++ )
         wxLogDebug( wxT( "    " ) + i->GetName() );
+
     wxLogDebug( wxT( "end LoadLibraries ()" ) );
 #endif
 }
diff --git a/include/wxEeschemaStruct.h b/include/wxEeschemaStruct.h
index 11fb9851cc..e1bcdb5d2d 100644
--- a/include/wxEeschemaStruct.h
+++ b/include/wxEeschemaStruct.h
@@ -1,6 +1,6 @@
-/***********************************************************/
-/*              wxEeschemaStruct.h:                        */
-/***********************************************************/
+/**
+ * @file wxEeschemaStruct.h
+ */
 
 #ifndef  WX_EESCHEMA_STRUCT_H
 #define  WX_EESCHEMA_STRUCT_H
@@ -938,10 +938,10 @@ public:
      */
     void SaveUndoItemInUndoList( SCH_ITEM* aItem );
 
-    // ERC:
-
     /**
-     * Load component libraries defined in project file.
+     * Function LoadLibraries
+     *
+     * Clear all libraries currently loaded and load all of the project libraries.
      */
     void LoadLibraries( void );