diff --git a/src/printer_schema.h b/src/printer_schema.h
index dbd3082..0a5254d 100644
--- a/src/printer_schema.h
+++ b/src/printer_schema.h
@@ -41,10 +41,10 @@
 /* Keep the value 0x02 reserver for implicit LYS_PRINT_FORMAT */
 #define LYS_OUTPUT_NO_SUBSTMT        0x10 /**< Print only top-level/referede node information,
                                                do not print information from the substatements */
-//#define LYS_OUTOPT_TREE_RFC        0x01 /**< Conform to the RFC TODO tree output (only for tree format) */
-//#define LYS_OUTOPT_TREE_GROUPING   0x02 /**< Print groupings separately (only for tree format) */
-//#define LYS_OUTOPT_TREE_USES       0x04 /**< Print only uses instead the resolved grouping nodes (only for tree format) */
-//#define LYS_OUTOPT_TREE_NO_LEAFREF 0x08 /**< Do not print the target of leafrefs (only for tree format) */
+// #define LYS_OUTOPT_TREE_RFC        0x01 /**< Conform to the RFC TODO tree output (only for tree format) */
+// #define LYS_OUTOPT_TREE_GROUPING   0x02 /**< Print groupings separately (only for tree format) */
+// #define LYS_OUTOPT_TREE_USES       0x04 /**< Print only uses instead the resolved grouping nodes (only for tree format) */
+// #define LYS_OUTOPT_TREE_NO_LEAFREF 0x08 /**< Do not print the target of leafrefs (only for tree format) */
 
 /** @} schemaprinterflags */
 
diff --git a/src/tree_schema.h b/src/tree_schema.h
index 8837bce..56cd450 100644
--- a/src/tree_schema.h
+++ b/src/tree_schema.h
@@ -259,13 +259,13 @@
     LYEXT_PAR_IDENT,     /**< ::lysc_ident */
     LYEXT_PAR_EXT,       /**< ::lysc_ext */
     LYEXT_PAR_IMPORT,    /**< ::lysp_import */
-//    LYEXT_PAR_TPDF,      /**< ::lysp_tpdf */
-//    LYEXT_PAR_EXTINST,   /**< ::lysp_ext_instance */
-//    LYEXT_PAR_REFINE,    /**< ::lysp_refine */
-//    LYEXT_PAR_DEVIATION, /**< ::lysp_deviation */
-//    LYEXT_PAR_DEVIATE,   /**< ::lysp_deviate */
-//    LYEXT_PAR_INCLUDE,   /**< ::lysp_include */
-//    LYEXT_PAR_REVISION,  /**< ::lysp_revision */
+// LYEXT_PAR_TPDF,      /**< ::lysp_tpdf */
+// LYEXT_PAR_EXTINST,   /**< ::lysp_ext_instance */
+// LYEXT_PAR_REFINE,    /**< ::lysp_refine */
+// LYEXT_PAR_DEVIATION, /**< ::lysp_deviation */
+// LYEXT_PAR_DEVIATE,   /**< ::lysp_deviate */
+// LYEXT_PAR_INCLUDE,   /**< ::lysp_include */
+// LYEXT_PAR_REVISION,  /**< ::lysp_revision */
 } LYEXT_PARENT;
 
 /**
diff --git a/uncrustify.cfg b/uncrustify.cfg
index e27a574..8db3e27 100644
--- a/uncrustify.cfg
+++ b/uncrustify.cfg
@@ -864,7 +864,7 @@
 
 # Add or remove space after the opening of a C++ comment,
 # i.e. '// A' vs. '//A'.
-sp_cmt_cpp_start                = ignore    # ignore/add/remove/force
+sp_cmt_cpp_start                = force    # ignore/add/remove/force
 
 # If true, space is added with sp_cmt_cpp_start will be added after doxygen
 # sequences like '///', '///<', '//!' and '//!<'.
@@ -875,7 +875,7 @@
 sp_cmt_cpp_qttr                 = true     # true/false
 
 # Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force
+sp_endif_cmt                    = force    # ignore/add/remove/force
 
 # Add or remove space after 'new', 'delete' and 'delete[]'.
 sp_after_new                    = ignore   # ignore/add/remove/force