Fix compilation errors after the merge

src/widgets/terraform_widget.h

@@ -18,7 +18,7 @@ enum TerraformToolbarWidgets : WidgetID {
 	WID_TT_RAISE_LAND,                        ///< Raise land button.
 	WID_TT_LEVEL_LAND,                        ///< Level land button.
 	WID_TT_DEMOLISH,                          ///< Demolish aka dynamite button.
-	WID_TT_DEMOLISH_TREES,                    ///< Demolish trees only
+	CM_WID_TT_DEMOLISH_TREES,                    ///< Demolish trees only
 	WID_TT_BUY_LAND,                          ///< Buy land button.
 	WID_TT_PLANT_TREES,                       ///< Plant trees button (note: opens separate window, no place-push-button).
 	WID_TT_PLACE_SIGN,                        ///< Place sign button.

src/widgets/town_widget.h

@@ -78,6 +78,7 @@ enum BuildHouseWidgets : WidgetID {
 	WID_BH_PROTECT_ON, ///< Button to not protect the next house built.
 };
 
+// TODO move to cm folder
 enum TownHK {
 	HK_SADVERT,
 	HK_MADVERT,