diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9a50c728dd7bdabd2be13b9f4f5637d6147168cc..cda4e8e2a055c41d683275be321e8a9e10ed30d6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Menu Tag 7.x-1.x-dev
+--------------------
+- Issue #1785676 by pivica: Properly include files in form alter.
+
 Menu Tag 7.x-1.0 2012-07-31
 ---------------------------
 - First stable release, no new features added since the last dev release.
\ No newline at end of file
diff --git a/menu_tag.module b/menu_tag.module
index 4869b4914088d21c89fa2669295fee460c83b6e4..b226753f4c9c471b274a2abf6e16ce4fffc5c1c7 100644
--- a/menu_tag.module
+++ b/menu_tag.module
@@ -66,7 +66,7 @@ function menu_tag_block_view_alter(&$data, $block) {
  * @see menu_tag_menu_item_form_submit()
  */
 function menu_tag_form_menu_edit_item_alter(&$form, $form_state) {
-  module_load_include('inc', 'menu_tag', 'menu_tag.forms');
+  form_load_include($form_state, 'inc', 'menu_tag', 'menu_tag.forms');
   menu_tag_menu_item_form_alter($form);
 }
 
@@ -79,7 +79,7 @@ function menu_tag_form_menu_edit_item_alter(&$form, $form_state) {
  */
 function menu_tag_form_node_form_alter(&$form, $form_state) {
   if (isset($form['menu'])) {
-    module_load_include('inc', 'menu_tag', 'menu_tag.forms');
+    form_load_include($form_state, 'inc', 'menu_tag', 'menu_tag.forms');
     menu_tag_menu_item_node_form_alter($form);
   }
 }
@@ -90,7 +90,7 @@ function menu_tag_form_node_form_alter(&$form, $form_state) {
  * Adds menu tag option to the node's edit menu item form.
  */
 function menu_tag_form_menu_overview_form_alter(&$form, $form_state) {
-  module_load_include('inc', 'menu_tag', 'menu_tag.forms');
+  form_load_include($form_state, 'inc', 'menu_tag', 'menu_tag.forms');
   menu_tag_menu_overview_form_alter($form);
 }
 
@@ -101,7 +101,7 @@ function menu_tag_form_menu_overview_form_alter(&$form, $form_state) {
  * menu tags to use for main and secondary menu.
  */
 function menu_tag_form_menu_configure_alter(&$form, $form_state) {
-  module_load_include('inc', 'menu_tag', 'menu_tag.forms');
+  form_load_include($form_state, 'inc', 'menu_tag', 'menu_tag.forms');
   menu_tag_menu_configure_form_alter($form);
 }
 
@@ -113,7 +113,7 @@ function menu_tag_form_alter(&$form, $form_state) {
       && ($form['module']['#value'] == 'menu'
           || $form['module']['#value'] == 'menu_block')
       ) {
-    module_load_include('inc', 'menu_tag', 'menu_tag.forms');
+    form_load_include($form_state, 'inc', 'menu_tag', 'menu_tag.forms');
     menu_tag_menu_block_form_alter($form);
   }
 }
@@ -182,7 +182,3 @@ function menu_tag_preprocess_page(&$vars) {
     $vars['secondary_menu'] = theme_get_setting('toggle_secondary_menu') ? menu_tag_secondary_menu() : array();
   }
 }
-
-/* Helpers */
-
-