diff --git a/zabapgit.abap b/zabapgit.abap
index 6e6884eba..d7a8afcbb 100644
--- a/zabapgit.abap
+++ b/zabapgit.abap
@@ -1539,6 +1539,8 @@ CLASS lcl_serialize_clas DEFINITION INHERITING FROM lcl_serialize_common FINAL.
 
     CLASS-METHODS remove_signatures CHANGING ct_source TYPE seop_source_string.
 
+    CLASS-METHODS reduce CHANGING ct_source TYPE seop_source_string.
+
 ENDCLASS.                    "lcl_serialize_dtel DEFINITION
 
 *----------------------------------------------------------------------*
@@ -1548,6 +1550,25 @@ ENDCLASS.                    "lcl_serialize_dtel DEFINITION
 *----------------------------------------------------------------------*
 CLASS lcl_serialize_clas IMPLEMENTATION.
 
+  METHOD reduce.
+
+    DATA: lv_source LIKE LINE OF ct_source,
+          lv_found  TYPE abap_bool.
+
+
+* skip files that only contain the standard comments
+    lv_found = abap_false.
+    LOOP AT ct_source INTO lv_source.
+      IF strlen( lv_source ) >= 3 AND lv_source(3) <> '*"*'.
+        lv_found = abap_true.
+      ENDIF.
+    ENDLOOP.
+    IF lv_found = abap_false.
+      CLEAR ct_source[].
+    ENDIF.
+
+  ENDMETHOD.                    "reduce
+
   METHOD serialize_locals_imp.
 
     CALL FUNCTION 'SEO_CLASS_GET_INCLUDE_SOURCE'
@@ -1564,6 +1585,8 @@ CLASS lcl_serialize_clas IMPLEMENTATION.
       _raise 'Error from get_include_source'.
     ENDIF.
 
+    reduce( CHANGING ct_source = rt_source ).
+
   ENDMETHOD.                    "serialize_local
 
   METHOD serialize_locals_def.
@@ -1582,6 +1605,8 @@ CLASS lcl_serialize_clas IMPLEMENTATION.
       _raise 'Error from get_include_source'.
     ENDIF.
 
+    reduce( CHANGING ct_source = rt_source ).
+
   ENDMETHOD.                    "serialize_locals_def
 
   METHOD serialize_testclasses.
@@ -1596,7 +1621,7 @@ CLASS lcl_serialize_clas IMPLEMENTATION.
         _internal_class_not_existing = 1
         not_existing                 = 2
         OTHERS                       = 3.
-    IF sy-subrc <> 0.
+    IF sy-subrc <> 0 AND sy-subrc <> 2.
       _raise 'Error from get_include_source'.
     ENDIF.
 
@@ -1618,6 +1643,8 @@ CLASS lcl_serialize_clas IMPLEMENTATION.
       _raise 'Error from get_include_source'.
     ENDIF.
 
+    reduce( CHANGING ct_source = rt_source ).
+
   ENDMETHOD.                    "serialize_macro
 
   METHOD serialize_abap.