diff --git a/TODO.txt b/TODO.txt
index 44c29fe09..b7620635a 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -31,7 +31,6 @@ Refactoring
 - Replace JRect & jrect with gfx::Rect.
 - Create gfx::Region to replace JRegion & jregion.
 - editors_ -> MultiEditors class widget
-- rename core/cfg.h to cfg_file.h
 - convert all widgets to classes:
   + match Jinete design with Vaca library.
   + move all functions (jwidget_*) to methods in Widget class.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7d0f1688f..b634025b1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,11 +82,15 @@ add_library(aseprite-library
   context_flags.cpp
   document.cpp
   documents.cpp
+  drop_files.cpp
+  file_system.cpp
   gfxmode.cpp
   gui_xml.cpp
+  ini_file.cpp
   job.cpp
   launcher.cpp
   log.cpp
+  modules.cpp
   objects_container_impl.cpp
   recent_files.cpp
   resource_finder.cpp
@@ -177,10 +181,6 @@ add_library(aseprite-library
   commands/filters/filter_target_buttons.cpp
   commands/filters/filter_window.cpp
   commands/filters/filter_worker.cpp
-  core/cfg.cpp
-  core/drop_files.cpp
-  core/file_system.cpp
-  core/modules.cpp
   dialogs/aniedit.cpp
   dialogs/drawtext.cpp
   dialogs/filesel.cpp
diff --git a/src/app.cpp b/src/app.cpp
index f1ab41731..2d8d54c97 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -27,16 +27,16 @@
 #include "commands/commands.h"
 #include "commands/params.h"
 #include "console.h"
-#include "core/cfg.h"
-#include "core/drop_files.h"
-#include "core/file_system.h"
-#include "core/modules.h"
+#include "drop_files.h"
 #include "file/file.h"
 #include "file/file_formats_manager.h"
+#include "file_system.h"
 #include "gui/gui.h"
 #include "gui/intern.h"
 #include "gui_xml.h"
+#include "ini_file.h"
 #include "log.h"
+#include "modules.h"
 #include "modules/editors.h"
 #include "modules/gfx.h"
 #include "modules/gui.h"
diff --git a/src/check_args.cpp b/src/check_args.cpp
index 166018e78..0630937bf 100644
--- a/src/check_args.cpp
+++ b/src/check_args.cpp
@@ -18,12 +18,13 @@
 
 #include "config.h"
 
+#include "check_args.h"
+
 #include "base/convert_to.h"
 #include "base/split_string.h"
 #include "base/string.h"
-#include "check_args.h"
 #include "console.h"
-#include "core/cfg.h"
+#include "ini_file.h"
 
 CheckArgs::CheckArgs(const std::vector<base::string>& args)
   : m_consoleOnly(false)
diff --git a/src/commands/cmd_advanced_mode.cpp b/src/commands/cmd_advanced_mode.cpp
index 4281faac6..ce74404e9 100644
--- a/src/commands/cmd_advanced_mode.cpp
+++ b/src/commands/cmd_advanced_mode.cpp
@@ -20,9 +20,9 @@
 
 #include "gui/gui.h"
 
-#include "commands/command.h"
 #include "app.h"
-#include "core/cfg.h"
+#include "commands/command.h"
+#include "ini_file.h"
 #include "modules/gui.h"
 #include "widgets/color_bar.h"
 #include "widgets/statebar.h"
diff --git a/src/commands/cmd_duplicate_sprite.cpp b/src/commands/cmd_duplicate_sprite.cpp
index 694d92532..c670a20ae 100644
--- a/src/commands/cmd_duplicate_sprite.cpp
+++ b/src/commands/cmd_duplicate_sprite.cpp
@@ -22,14 +22,14 @@
 
 #include "gui/gui.h"
 
-#include "ui_context.h"
-#include "commands/command.h"
 #include "app.h"
-#include "core/cfg.h"
+#include "commands/command.h"
+#include "document_wrappers.h"
+#include "ini_file.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "raster/sprite.h"
-#include "document_wrappers.h"
+#include "ui_context.h"
 
 //////////////////////////////////////////////////////////////////////
 // duplicate_sprite
diff --git a/src/commands/cmd_new_file.cpp b/src/commands/cmd_new_file.cpp
index 04a8aea9c..c7ddec7a7 100644
--- a/src/commands/cmd_new_file.cpp
+++ b/src/commands/cmd_new_file.cpp
@@ -24,8 +24,8 @@
 #include "base/unique_ptr.h"
 #include "commands/command.h"
 #include "console.h"
-#include "core/cfg.h"
 #include "gui/gui.h"
+#include "ini_file.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
diff --git a/src/commands/cmd_options.cpp b/src/commands/cmd_options.cpp
index 724a76721..fc552b7a5 100644
--- a/src/commands/cmd_options.cpp
+++ b/src/commands/cmd_options.cpp
@@ -26,7 +26,7 @@
 #include "app.h"
 #include "commands/command.h"
 #include "context.h"
-#include "core/cfg.h"
+#include "ini_file.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "raster/image.h"
diff --git a/src/commands/cmd_palette_editor.cpp b/src/commands/cmd_palette_editor.cpp
index b87e1432e..6330beea2 100644
--- a/src/commands/cmd_palette_editor.cpp
+++ b/src/commands/cmd_palette_editor.cpp
@@ -26,7 +26,6 @@
 #include "commands/command.h"
 #include "commands/params.h"
 #include "console.h"
-#include "core/cfg.h"
 #include "dialogs/filesel.h"
 #include "document_wrappers.h"
 #include "gfx/hsv.h"
@@ -34,6 +33,7 @@
 #include "gfx/size.h"
 #include "gui/graphics.h"
 #include "gui/gui.h"
+#include "ini_file.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
diff --git a/src/commands/cmd_sprite_size.cpp b/src/commands/cmd_sprite_size.cpp
index bae6c6f54..c9a7c2e35 100644
--- a/src/commands/cmd_sprite_size.cpp
+++ b/src/commands/cmd_sprite_size.cpp
@@ -20,9 +20,9 @@
 
 #include "base/bind.h"
 #include "commands/command.h"
-#include "core/cfg.h"
 #include "document_wrappers.h"
 #include "gui/gui.h"
+#include "ini_file.h"
 #include "job.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
diff --git a/src/commands/filters/cmd_color_curve.cpp b/src/commands/filters/cmd_color_curve.cpp
index f498f0ff7..334146b38 100644
--- a/src/commands/filters/cmd_color_curve.cpp
+++ b/src/commands/filters/cmd_color_curve.cpp
@@ -25,14 +25,14 @@
 #include "commands/filters/color_curve_editor.h"
 #include "commands/filters/filter_manager_impl.h"
 #include "commands/filters/filter_window.h"
-#include "core/cfg.h"
+#include "document_wrappers.h"
 #include "filters/color_curve.h"
 #include "filters/color_curve_filter.h"
 #include "gui/gui.h"
+#include "ini_file.h"
 #include "modules/gui.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
-#include "document_wrappers.h"
 #include "widgets/color_button.h"
 
 static ColorCurve* the_curve = NULL;
diff --git a/src/commands/filters/cmd_convolution_matrix.cpp b/src/commands/filters/cmd_convolution_matrix.cpp
index fa2f0a9b3..bac33bf4d 100644
--- a/src/commands/filters/cmd_convolution_matrix.cpp
+++ b/src/commands/filters/cmd_convolution_matrix.cpp
@@ -26,7 +26,7 @@
 #include "commands/filters/convolution_matrix_stock.h"
 #include "commands/filters/filter_manager_impl.h"
 #include "commands/filters/filter_window.h"
-#include "core/cfg.h"
+#include "document_wrappers.h"
 #include "filters/convolution_matrix.h"
 #include "filters/convolution_matrix_filter.h"
 #include "gui/button.h"
@@ -37,10 +37,10 @@
 #include "gui/slider.h"
 #include "gui/view.h"
 #include "gui/widget.h"
+#include "ini_file.h"
 #include "modules/gui.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
-#include "document_wrappers.h"
 
 static const char* ConfigSection = "ConvolutionMatrix";
 
diff --git a/src/commands/filters/cmd_despeckle.cpp b/src/commands/filters/cmd_despeckle.cpp
index 8bc725f30..e1135f21f 100644
--- a/src/commands/filters/cmd_despeckle.cpp
+++ b/src/commands/filters/cmd_despeckle.cpp
@@ -24,18 +24,18 @@
 #include "commands/command.h"
 #include "commands/filters/filter_manager_impl.h"
 #include "commands/filters/filter_window.h"
-#include "core/cfg.h"
+#include "document_wrappers.h"
 #include "filters/median_filter.h"
 #include "gui/button.h"
 #include "gui/entry.h"
 #include "gui/frame.h"
 #include "gui/grid.h"
 #include "gui/widget.h"
+#include "ini_file.h"
 #include "modules/gui.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "settings/settings.h"
-#include "document_wrappers.h"
 
 static const char* ConfigSection = "Despeckle";
 
diff --git a/src/commands/filters/cmd_invert_color.cpp b/src/commands/filters/cmd_invert_color.cpp
index 91e58bf5d..bf10f9cda 100644
--- a/src/commands/filters/cmd_invert_color.cpp
+++ b/src/commands/filters/cmd_invert_color.cpp
@@ -23,18 +23,18 @@
 #include "commands/command.h"
 #include "commands/filters/filter_manager_impl.h"
 #include "commands/filters/filter_window.h"
-#include "core/cfg.h"
+#include "document_wrappers.h"
 #include "filters/invert_color_filter.h"
 #include "gui/button.h"
 #include "gui/frame.h"
 #include "gui/label.h"
 #include "gui/slider.h"
 #include "gui/widget.h"
+#include "ini_file.h"
 #include "modules/gui.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
-#include "document_wrappers.h"
 #include "widgets/color_button.h"
 
 static const char* ConfigSection = "InvertColor";
diff --git a/src/commands/filters/cmd_replace_color.cpp b/src/commands/filters/cmd_replace_color.cpp
index 7a8d248d9..06ff6f0d8 100644
--- a/src/commands/filters/cmd_replace_color.cpp
+++ b/src/commands/filters/cmd_replace_color.cpp
@@ -25,16 +25,16 @@
 #include "app/color_utils.h"
 #include "base/bind.h"
 #include "commands/command.h"
-#include "commands/filters/filter_window.h"
 #include "commands/filters/filter_manager_impl.h"
-#include "core/cfg.h"
+#include "commands/filters/filter_window.h"
+#include "document_wrappers.h"
 #include "filters/replace_color_filter.h"
 #include "gui/gui.h"
+#include "ini_file.h"
 #include "modules/gui.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
-#include "document_wrappers.h"
 #include "widgets/color_bar.h"
 #include "widgets/color_button.h"
 
diff --git a/src/commands/filters/filter_manager_impl.cpp b/src/commands/filters/filter_manager_impl.cpp
index 360f1287d..a17b25812 100644
--- a/src/commands/filters/filter_manager_impl.cpp
+++ b/src/commands/filters/filter_manager_impl.cpp
@@ -20,13 +20,13 @@
 
 #include "commands/filters/filter_manager_impl.h"
 
-#include "core/cfg.h"
 #include "filters/filter.h"
 #include "gui/manager.h"
 #include "gui/rect.h"
 #include "gui/region.h"
 #include "gui/view.h"
 #include "gui/widget.h"
+#include "ini_file.h"
 #include "modules/editors.h"
 #include "raster/cel.h"
 #include "raster/image.h"
diff --git a/src/commands/filters/filter_window.cpp b/src/commands/filters/filter_window.cpp
index 9be592ab1..de5d13f22 100644
--- a/src/commands/filters/filter_window.cpp
+++ b/src/commands/filters/filter_window.cpp
@@ -23,7 +23,7 @@
 #include "base/bind.h"
 #include "commands/filters/filter_manager_impl.h"
 #include "commands/filters/filter_worker.h"
-#include "core/cfg.h"
+#include "ini_file.h"
 #include "modules/gui.h"
 
 FilterWindow::FilterWindow(const char* title, const char* cfgSection,
diff --git a/src/commands/filters/filter_worker.cpp b/src/commands/filters/filter_worker.cpp
index ee227afc8..e1df2ae7d 100644
--- a/src/commands/filters/filter_worker.cpp
+++ b/src/commands/filters/filter_worker.cpp
@@ -26,8 +26,8 @@
 #include "base/scoped_lock.h"
 #include "base/thread.h"
 #include "commands/filters/filter_manager_impl.h"
-#include "core/cfg.h"
 #include "gui/gui.h"
+#include "ini_file.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "raster/sprite.h"
diff --git a/src/dialogs/drawtext.cpp b/src/dialogs/drawtext.cpp
index 618223527..36ab29bd8 100644
--- a/src/dialogs/drawtext.cpp
+++ b/src/dialogs/drawtext.cpp
@@ -23,10 +23,10 @@
 #include "gui/gui.h"
 
 #include "app.h"
-#include "console.h"
-#include "core/cfg.h"
 #include "app/color.h"
+#include "console.h"
 #include "dialogs/filesel.h"
+#include "ini_file.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
 #include "raster/blend.h"
diff --git a/src/dialogs/filesel.cpp b/src/dialogs/filesel.cpp
index a6da629bf..1c9d18273 100644
--- a/src/dialogs/filesel.cpp
+++ b/src/dialogs/filesel.cpp
@@ -33,9 +33,9 @@
 #include "base/bind.h"
 #include "base/path.h"
 #include "base/split_string.h"
-#include "core/cfg.h"
 #include "file/file.h"
 #include "gui/gui.h"
+#include "ini_file.h"
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "recent_files.h"
@@ -82,7 +82,7 @@ static void on_exit_delete_navigation_history()
  * Shows the dialog to select a file in ASE.
  * 
  * Mainly it uses:
- * - the 'core/file_system' routines.
+ * - the 'file_system' routines.
  * - the 'widgets/fileview' widget.
  */
 base::string ase_file_selector(const base::string& message,
diff --git a/src/dialogs/maskcol.cpp b/src/dialogs/maskcol.cpp
index 1feedbf65..5c44c57ac 100644
--- a/src/dialogs/maskcol.cpp
+++ b/src/dialogs/maskcol.cpp
@@ -22,7 +22,6 @@
 #include "app/color.h"
 #include "app/color_utils.h"
 #include "base/bind.h"
-#include "core/cfg.h"
 #include "document.h"
 #include "document_wrappers.h"
 #include "gui/box.h"
@@ -32,6 +31,7 @@
 #include "gui/label.h"
 #include "gui/slider.h"
 #include "gui/widget.h"
+#include "ini_file.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "raster/image.h"
diff --git a/src/dialogs/repo.cpp b/src/dialogs/repo.cpp
index 63c946a77..0a7465c73 100644
--- a/src/dialogs/repo.cpp
+++ b/src/dialogs/repo.cpp
@@ -24,8 +24,8 @@
 #include "base/bind.h"
 #include "gui/gui.h"
 
-#include "core/cfg.h"
 #include "dialogs/repo.h"
+#include "ini_file.h"
 #include "modules/gui.h"
 
 static void fill_listbox(RepoDlg *repo_dlg);
diff --git a/src/core/drop_files.cpp b/src/drop_files.cpp
similarity index 99%
rename from src/core/drop_files.cpp
rename to src/drop_files.cpp
index 95e57e1dc..c07d41414 100644
--- a/src/core/drop_files.cpp
+++ b/src/drop_files.cpp
@@ -55,7 +55,7 @@ void install_drop_files()
 void uninstall_drop_files()
 {
   unsubclass_hwnd();
-  
+
   delete dropped_files_mutex;
   dropped_files_mutex = NULL;
 
diff --git a/src/core/drop_files.h b/src/drop_files.h
similarity index 92%
rename from src/core/drop_files.h
rename to src/drop_files.h
index f1aa40525..8d474ed4a 100644
--- a/src/core/drop_files.h
+++ b/src/drop_files.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef CORE_DROP_FILES_H_INCLUDED
-#define CORE_DROP_FILES_H_INCLUDED
+#ifndef DROP_FILES_H_INCLUDED
+#define DROP_FILES_H_INCLUDED
 
 void install_drop_files();
 void uninstall_drop_files();
@@ -25,4 +25,3 @@ void uninstall_drop_files();
 void check_for_dropped_files();
 
 #endif
-
diff --git a/src/file/jpeg_format.cpp b/src/file/jpeg_format.cpp
index 3f882bd4b..f4c2b6a81 100644
--- a/src/file/jpeg_format.cpp
+++ b/src/file/jpeg_format.cpp
@@ -26,11 +26,11 @@
 #include "base/compiler_specific.h"
 #include "base/memory.h"
 #include "console.h"
-#include "core/cfg.h"
 #include "file/file.h"
 #include "file/file_format.h"
 #include "file/format_options.h"
 #include "gui/gui.h"
+#include "ini_file.h"
 #include "modules/gui.h"
 #include "raster/raster.h"
 
diff --git a/src/file/png_format.cpp b/src/file/png_format.cpp
index 7ebc11219..10ef34a8e 100644
--- a/src/file/png_format.cpp
+++ b/src/file/png_format.cpp
@@ -19,11 +19,11 @@
 #include "config.h"
 
 #include "app.h"
-#include "core/cfg.h"
 #include "document.h"
 #include "file/file.h"
 #include "file/file_format.h"
 #include "file/format_options.h"
+#include "ini_file.h"
 #include "raster/raster.h"
 
 #include <stdio.h>
diff --git a/src/core/file_system.cpp b/src/file_system.cpp
similarity index 99%
rename from src/core/file_system.cpp
rename to src/file_system.cpp
index be029f452..84866f010 100644
--- a/src/core/file_system.cpp
+++ b/src/file_system.cpp
@@ -56,7 +56,7 @@
 #endif
 
 #include "base/path.h"
-#include "core/file_system.h"
+#include "file_system.h"
 
 //////////////////////////////////////////////////////////////////////
 
@@ -216,7 +216,7 @@ FileSystemModule::FileSystemModule()
 
   PRINTF("File system module installed\n");
 }
- 
+
 /**
  * Shutdowns the file-system module.
  */
@@ -321,7 +321,7 @@ IFileItem* FileSystemModule::getRootFileItem()
 
 /**
  * Returns the FileItem through the specified @a path.
- * 
+ *
  * @warning You have to call path.fix_separators() before.
  */
 IFileItem* FileSystemModule::getFileItemFromPath(const base::string& path)
@@ -825,7 +825,7 @@ static LPITEMIDLIST get_next_pidl(LPITEMIDLIST pidl)
   }
 
   return NULL;
-} 
+}
 
 static LPITEMIDLIST get_last_pidl(LPITEMIDLIST pidl)
 {
diff --git a/src/core/file_system.h b/src/file_system.h
similarity index 96%
rename from src/core/file_system.h
rename to src/file_system.h
index c0a3ebc53..47a1f681e 100644
--- a/src/core/file_system.h
+++ b/src/file_system.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef CORE_FILE_SYSTEM_H_INCLUDED
-#define CORE_FILE_SYSTEM_H_INCLUDED
+#ifndef FILE_SYSTEM_H_INCLUDED
+#define FILE_SYSTEM_H_INCLUDED
 
 #include "base/string.h"
 
@@ -69,4 +69,3 @@ public:
 };
 
 #endif
-
diff --git a/src/core/cfg.cpp b/src/ini_file.cpp
similarity index 99%
rename from src/core/cfg.cpp
rename to src/ini_file.cpp
index 54b833dae..321a7b871 100644
--- a/src/core/cfg.cpp
+++ b/src/ini_file.cpp
@@ -18,15 +18,15 @@
 
 #include "config.h"
 
+#include "ini_file.h"
+
+#include "gui/rect.h"
+#include "resource_finder.h"
+
 #include <allegro/config.h>
 #include <allegro/file.h>
 #include <allegro/unicode.h>
 
-#include "gui/rect.h"
-
-#include "core/cfg.h"
-#include "resource_finder.h"
-
 using namespace gfx;
 
 static char config_filename[512];
diff --git a/src/core/cfg.h b/src/ini_file.h
similarity index 96%
rename from src/core/cfg.h
rename to src/ini_file.h
index 4e574597c..ea04b8b6b 100644
--- a/src/core/cfg.h
+++ b/src/ini_file.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef CORE_CFG_H_INCLUDED
-#define CORE_CFG_H_INCLUDED
+#ifndef INI_FILE_H_INCLUDED
+#define INI_FILE_H_INCLUDED
 
 #include <allegro/config.h>
 #include "gfx/rect.h"
diff --git a/src/job.h b/src/job.h
index 1f7a463b8..39bffb17c 100644
--- a/src/job.h
+++ b/src/job.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef CORE_JOB_H_INCLUDED
-#define CORE_JOB_H_INCLUDED
+#ifndef JOB_H_INCLUDED
+#define JOB_H_INCLUDED
 
 #include "gui/alert.h"
 
diff --git a/src/core/modules.cpp b/src/modules.cpp
similarity index 98%
rename from src/core/modules.cpp
rename to src/modules.cpp
index 831b44518..cc887fd02 100644
--- a/src/core/modules.cpp
+++ b/src/modules.cpp
@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "core/modules.h"
+#include "modules.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
diff --git a/src/core/modules.h b/src/modules.h
similarity index 94%
rename from src/core/modules.h
rename to src/modules.h
index 9fe88e701..3f015e841 100644
--- a/src/core/modules.h
+++ b/src/modules.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef CORE_MODULES_H_INCLUDED
-#define CORE_MODULES_H_INCLUDED
+#ifndef MODULES_H_INCLUDED
+#define MODULES_H_INCLUDED
 
 #include "gui/base.h"
 
@@ -37,4 +37,3 @@ public:
 };
 
 #endif
-
diff --git a/src/modules/editors.cpp b/src/modules/editors.cpp
index 52fbd0f44..6e175f59a 100644
--- a/src/modules/editors.cpp
+++ b/src/modules/editors.cpp
@@ -21,9 +21,9 @@
 #include "modules/editors.h"
 
 #include "app.h"
-#include "core/cfg.h"
 #include "document_wrappers.h"
 #include "gui/gui.h"
+#include "ini_file.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
 #include "raster/image.h"
diff --git a/src/modules/gfx.cpp b/src/modules/gfx.cpp
index f39e666b9..54712e074 100644
--- a/src/modules/gfx.cpp
+++ b/src/modules/gfx.cpp
@@ -29,9 +29,9 @@
 #include "app.h"
 #include "app/color_utils.h"
 #include "console.h"
-#include "core/cfg.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"
+#include "ini_file.h"
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
diff --git a/src/modules/gui.cpp b/src/modules/gui.cpp
index 45ea25f9a..546f69411 100644
--- a/src/modules/gui.cpp
+++ b/src/modules/gui.cpp
@@ -34,11 +34,12 @@
 #include "commands/commands.h"
 #include "commands/params.h"
 #include "console.h"
-#include "core/cfg.h"
-#include "core/drop_files.h"
+#include "drop_files.h"
+#include "document_wrappers.h"
 #include "gfxmode.h"
 #include "gui/gui.h"
 #include "gui/intern.h"
+#include "ini_file.h"
 #include "modules/editors.h"
 #include "modules/gfx.h"
 #include "modules/gui.h"
@@ -49,7 +50,6 @@
 #include "skin/button_icon_impl.h"
 #include "skin/skin_property.h"
 #include "skin/skin_theme.h"
-#include "document_wrappers.h"
 #include "tools/tool_box.h"
 #include "ui_context.h"
 #include "widgets/editor/editor.h"
diff --git a/src/recent_files.cpp b/src/recent_files.cpp
index a8caa0819..e6315d59e 100644
--- a/src/recent_files.cpp
+++ b/src/recent_files.cpp
@@ -18,13 +18,14 @@
 
 #include "config.h"
 
-#include <cstdio>
-#include <cstring>
-#include <algorithm>
+#include "recent_files.h"
 
 #include "app.h"
-#include "core/cfg.h"
-#include "recent_files.h"
+#include "ini_file.h"
+
+#include <algorithm>
+#include <cstdio>
+#include <cstring>
 
 RecentFiles::RecentFiles()
   : m_limit(16)
diff --git a/src/settings/ui_settings_impl.cpp b/src/settings/ui_settings_impl.cpp
index 3abf64c72..0d8939313 100644
--- a/src/settings/ui_settings_impl.cpp
+++ b/src/settings/ui_settings_impl.cpp
@@ -21,7 +21,7 @@
 #include "settings/ui_settings_impl.h"
 
 #include "app.h"
-#include "core/cfg.h"
+#include "ini_file.h"
 #include "tools/point_shape.h"
 #include "tools/tool.h"
 #include "tools/tool_box.h"
diff --git a/src/util/misc.cpp b/src/util/misc.cpp
index 044f28cf2..67c4cd747 100644
--- a/src/util/misc.cpp
+++ b/src/util/misc.cpp
@@ -23,11 +23,11 @@
 
 #include "app.h"
 #include "app/color.h"
-#include "core/cfg.h"
 #include "gui/list.h"
 #include "gui/manager.h"
 #include "gui/system.h"
 #include "gui/widget.h"
+#include "ini_file.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
diff --git a/src/util/render.cpp b/src/util/render.cpp
index f86736a34..cf64ceaa9 100644
--- a/src/util/render.cpp
+++ b/src/util/render.cpp
@@ -21,9 +21,9 @@
 #include "util/render.h"
 
 #include "app/color_utils.h"
-#include "core/cfg.h"
 #include "document.h"
 #include "gui/list.h"
+#include "ini_file.h"
 #include "raster/raster.h"
 #include "settings/settings.h"
 #include "ui_context.h"
diff --git a/src/widgets/color_bar.cpp b/src/widgets/color_bar.cpp
index 8d66e78df..da585d426 100644
--- a/src/widgets/color_bar.cpp
+++ b/src/widgets/color_bar.cpp
@@ -25,9 +25,9 @@
 #include "base/bind.h"
 #include "commands/commands.h"
 #include "commands/params.h"
-#include "core/cfg.h"
 #include "gui/list.h"
 #include "gui/message.h"
+#include "ini_file.h"
 #include "modules/gui.h"
 #include "raster/image.h"
 #include "skin/skin_theme.h"
diff --git a/src/widgets/editor/click.cpp b/src/widgets/editor/click.cpp
index 57c1792d8..1f6f062d9 100644
--- a/src/widgets/editor/click.cpp
+++ b/src/widgets/editor/click.cpp
@@ -20,12 +20,12 @@
 
 #include <allegro/keyboard.h>
 
-#include "core/cfg.h"
 #include "gui/manager.h"
 #include "gui/rect.h"
 #include "gui/system.h"
 #include "gui/view.h"
 #include "gui/widget.h"
+#include "ini_file.h"
 #include "modules/gui.h"
 #include "widgets/editor/editor.h"
 
diff --git a/src/widgets/editor/cursor.cpp b/src/widgets/editor/cursor.cpp
index 7b3931a8e..dd1f0e22f 100644
--- a/src/widgets/editor/cursor.cpp
+++ b/src/widgets/editor/cursor.cpp
@@ -22,13 +22,13 @@
 #include "app/color.h"
 #include "app/color_utils.h"
 #include "base/memory.h"
-#include "core/cfg.h"
 #include "gui/base.h"
 #include "gui/list.h"
 #include "gui/rect.h"
 #include "gui/region.h"
 #include "gui/system.h"
 #include "gui/widget.h"
+#include "ini_file.h"
 #include "modules/editors.h"
 #include "raster/image.h"
 #include "raster/layer.h"
diff --git a/src/widgets/editor/editor.cpp b/src/widgets/editor/editor.cpp
index df678cb37..3228c1f25 100644
--- a/src/widgets/editor/editor.cpp
+++ b/src/widgets/editor/editor.cpp
@@ -27,9 +27,9 @@
 #include "app/color_utils.h"
 #include "commands/commands.h"
 #include "commands/params.h"
-#include "core/cfg.h"
 #include "document_wrappers.h"
 #include "gui/gui.h"
+#include "ini_file.h"
 #include "modules/editors.h"
 #include "modules/gfx.h"
 #include "modules/gui.h"
diff --git a/src/widgets/editor/standby_state.cpp b/src/widgets/editor/standby_state.cpp
index 21a644c10..adfcccbcc 100644
--- a/src/widgets/editor/standby_state.cpp
+++ b/src/widgets/editor/standby_state.cpp
@@ -23,12 +23,12 @@
 #include "app.h"
 #include "commands/commands.h"
 #include "commands/params.h"
-#include "core/cfg.h"
 #include "gfx/rect.h"
 #include "gui/alert.h"
 #include "gui/message.h"
 #include "gui/system.h"
 #include "gui/view.h"
+#include "ini_file.h"
 #include "modules/editors.h"
 #include "raster/layer.h"
 #include "raster/mask.h"
diff --git a/src/widgets/fileview.h b/src/widgets/fileview.h
index 87471e6a5..674751cca 100644
--- a/src/widgets/fileview.h
+++ b/src/widgets/fileview.h
@@ -19,9 +19,9 @@
 #ifndef WIDGETS_FILEVIEW_H_INCLUDED
 #define WIDGETS_FILEVIEW_H_INCLUDED
 
-#include "gui/base.h"
 #include "base/string.h"
-#include "core/file_system.h"
+#include "file_system.h"
+#include "gui/base.h"
 
 /* TODO use some JI_SIGNAL_USER */
 #define SIGNAL_FILEVIEW_FILE_SELECTED		0x10006