diff --git a/src/objects/zcl_abapgit_object_fugr.clas.abap b/src/objects/zcl_abapgit_object_fugr.clas.abap
index 5ef401906..187a946e1 100644
--- a/src/objects/zcl_abapgit_object_fugr.clas.abap
+++ b/src/objects/zcl_abapgit_object_fugr.clas.abap
@@ -493,6 +493,11 @@ CLASS ZCL_ABAPGIT_OBJECT_FUGR IMPLEMENTATION.
               AND object = 'PROG'
               AND obj_name = rt_includes-table_line.
       LOOP AT rt_includes ASSIGNING <lv_include>.
+        " skip autogenerated includes from Table Maintenance Generator
+        IF <lv_include> CP 'LSVIM*'.
+          DELETE rt_includes INDEX sy-tabix.
+          CONTINUE.
+        ENDIF.
         READ TABLE lt_tadir_includes WITH KEY table_line = <lv_include> TRANSPORTING NO FIELDS.
         IF sy-subrc = 0.
           DELETE rt_includes.
@@ -516,10 +521,10 @@ CLASS ZCL_ABAPGIT_OBJECT_FUGR IMPLEMENTATION.
     LOOP AT rt_includes ASSIGNING <lv_include>.
       lv_tabix = sy-tabix.
 
-* skip SAP standard includes and also make sure the include exists
+* make sure the include exists
       READ TABLE lt_reposrc INTO ls_reposrc
         WITH KEY progname = <lv_include> BINARY SEARCH.
-      IF sy-subrc <> 0 OR ls_reposrc-cnam = 'SAP'.
+      IF sy-subrc <> 0.
         DELETE rt_includes INDEX lv_tabix.
       ENDIF.