diff --git a/lib/libcoolstream2/cs_api.h b/lib/libcoolstream2/cs_api.h
index 64b8180bc..6cb6b01a5 100644
--- a/lib/libcoolstream2/cs_api.h
+++ b/lib/libcoolstream2/cs_api.h
@@ -33,7 +33,7 @@ enum CS_LOG_MODULE {
 	CS_LOG_POWER_CLK,
 	CS_LOG_MEM,
 	CS_LOG_API,
-	CS_LOG_CA,
+	CS_LOG_CA
 };
 
 // Initialization
diff --git a/lib/libcoolstream2/cs_frontpanel.h b/lib/libcoolstream2/cs_frontpanel.h
index 19360f04f..e6ca97137 100644
--- a/lib/libcoolstream2/cs_frontpanel.h
+++ b/lib/libcoolstream2/cs_frontpanel.h
@@ -62,7 +62,7 @@ typedef enum {
 	FP_FLAG_ALIGN_LEFT		= 0x10,	/* align the text in display from the left (default) */
 	FP_FLAG_ALIGN_RIGHT		= 0x20,	/* align the text in display from the right (arabic) */
 	FP_FLAG_UPDATE_SCROLL_POS	= 0x40,	/* update the current position for scrolling (internal use only) */
-	FP_FLAG_USER			= 0x80,	/* user flags set (internal use only) */
+	FP_FLAG_USER			= 0x80	/* user flags set (internal use only) */
 } fp_flag;
 
 typedef struct {
@@ -80,7 +80,7 @@ typedef enum {
 	FP_LED_3_ON		= 0x88,
 	FP_LED_1_OFF		= 0x01,
 	FP_LED_2_OFF		= 0x02,
-	FP_LED_3_OFF		= 0x08,
+	FP_LED_3_OFF		= 0x08
 } fp_led_ctrl_t;
 
 typedef struct {
@@ -105,7 +105,7 @@ typedef struct {
 typedef enum {
 	FP_DISPLAY_TEXT_NONE	= 0,
 	FP_DISPLAY_TEXT_LIMITED,
-	FP_DISPLAY_TEXT_ALL,
+	FP_DISPLAY_TEXT_ALL
 } fp_display_text_type_t;
 
 typedef enum {
diff --git a/lib/libcoolstream2/dmx_cs.h b/lib/libcoolstream2/dmx_cs.h
index df105dcff..7dfe830d8 100644
--- a/lib/libcoolstream2/dmx_cs.h
+++ b/lib/libcoolstream2/dmx_cs.h
@@ -27,7 +27,7 @@
 
 typedef enum {
 	DMX_TS = 0,
-	DMX_DMA,
+	DMX_DMA
 } DMX_TYPE;
 
 typedef enum {
diff --git a/lib/libcoolstream2/video_cs.h b/lib/libcoolstream2/video_cs.h
index 9f15eb8fc..6c1da4931 100644
--- a/lib/libcoolstream2/video_cs.h
+++ b/lib/libcoolstream2/video_cs.h
@@ -32,7 +32,7 @@ typedef enum {
 	// Output types
 	ANALOG_xD_SCART		= (1 << 8), // Output is SCART
 	ANALOG_xD_CINCH		= (1 << 9), // Output is Cinch
-	ANALOG_xD_BOTH		= (3 << 8), // Output cannot individually control scart, cinch outputs
+	ANALOG_xD_BOTH		= (3 << 8) // Output cannot individually control scart, cinch outputs
 					    // due to limited amount of DACs (ie TANK, Trinity)
 } analog_mode_t;
 
diff --git a/src/gui/buildinfo.h b/src/gui/buildinfo.h
index 14a341232..3ef9377dc 100644
--- a/src/gui/buildinfo.h
+++ b/src/gui/buildinfo.h
@@ -66,7 +66,7 @@ class CBuildInfo :  public CMenuTarget, public CComponentsWindow
 			BI_TYPE_ID_CREATOR,
 #endif
 
-			BI_TYPE_IDS,
+			BI_TYPE_IDS
 		};
 
 		CBuildInfo();
diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h
index cd99a0bb3..4736598c8 100644
--- a/src/gui/components/cc_frm.h
+++ b/src/gui/components/cc_frm.h
@@ -123,7 +123,7 @@ class CComponentsForm : public CComponentsItem
 		{
 			PG_SCROLL_M_UP_DOWN_KEY 	= 1,
 			PG_SCROLL_M_LEFT_RIGHT_KEY 	= 2,
-			PG_SCROLL_M_OFF		 	= 4,
+			PG_SCROLL_M_OFF		 	= 4
 		};
 		///enable/disable page scroll, parameter1 default enabled for up/down keys
 		virtual void enablePageScroll(const int& mode = PG_SCROLL_M_UP_DOWN_KEY){page_scroll_mode = mode;};
diff --git a/src/gui/components/cc_frm_chain.cpp b/src/gui/components/cc_frm_chain.cpp
index 9d451041d..b3f8b9824 100644
--- a/src/gui/components/cc_frm_chain.cpp
+++ b/src/gui/components/cc_frm_chain.cpp
@@ -77,7 +77,7 @@ void CComponentsFrmChain::setDirection(int direction)
 {
 	chn_direction = direction;
 	initChainItems();
-};
+}
 
 void CComponentsFrmChain::initChainItems()
 {
diff --git a/src/gui/components/cc_item_progressbar.h b/src/gui/components/cc_item_progressbar.h
index 03a1996e1..842bcbc63 100644
--- a/src/gui/components/cc_item_progressbar.h
+++ b/src/gui/components/cc_item_progressbar.h
@@ -137,13 +137,13 @@ class CProgressBar : public CComponentsItem
 			PB_MATRIX,	/*  0 */
 			PB_LINES_V,	/*  1 */
 			PB_LINES_H,	/*  2 */
-			PB_COLOR,	/*  3 */
+			PB_COLOR	/*  3 */
 		};
 
 		enum pb_type_t {
 			PB_REDLEFT = 0,
 			PB_REDRIGHT,
-			PB_TIMESCALE,
+			PB_TIMESCALE
 		};
 
 		void setType(pb_type_t type);
diff --git a/src/zapit/include/linux/dvb/frontend.h b/src/zapit/include/linux/dvb/frontend.h
index c56d77c49..838c05ede 100644
--- a/src/zapit/include/linux/dvb/frontend.h
+++ b/src/zapit/include/linux/dvb/frontend.h
@@ -141,7 +141,7 @@ typedef enum fe_status {
 	FE_HAS_SYNC		= 0x08,
 	FE_HAS_LOCK		= 0x10,
 	FE_TIMEDOUT		= 0x20,
-	FE_REINIT		= 0x40,
+	FE_REINIT		= 0x40
 } fe_status_t;
 
 typedef enum fe_spectral_inversion {
@@ -164,7 +164,7 @@ typedef enum fe_code_rate {
 	FEC_AUTO,
 	FEC_3_5,
 	FEC_9_10,
-	FEC_2_5,
+	FEC_2_5
 } fe_code_rate_t;
 
 
@@ -182,7 +182,7 @@ typedef enum fe_modulation {
 	APSK_16,
 	APSK_32,
 	DQPSK,
-	QAM_4_NR,
+	QAM_4_NR
 } fe_modulation_t;
 
 typedef enum fe_transmit_mode {
@@ -194,7 +194,7 @@ typedef enum fe_transmit_mode {
 	TRANSMISSION_MODE_16K,
 	TRANSMISSION_MODE_32K,
 	TRANSMISSION_MODE_C1,
-	TRANSMISSION_MODE_C3780,
+	TRANSMISSION_MODE_C3780
 } fe_transmit_mode_t;
 
 #if defined(__DVB_CORE__) || !defined (__KERNEL__)
@@ -205,7 +205,7 @@ typedef enum fe_bandwidth {
 	BANDWIDTH_AUTO,
 	BANDWIDTH_5_MHZ,
 	BANDWIDTH_10_MHZ,
-	BANDWIDTH_1_712_MHZ,
+	BANDWIDTH_1_712_MHZ
 } fe_bandwidth_t;
 #endif
 
@@ -220,7 +220,7 @@ typedef enum fe_guard_interval {
 	GUARD_INTERVAL_19_256,
 	GUARD_INTERVAL_PN420,
 	GUARD_INTERVAL_PN595,
-	GUARD_INTERVAL_PN945,
+	GUARD_INTERVAL_PN945
 } fe_guard_interval_t;
 
 
@@ -236,7 +236,7 @@ enum fe_interleaving {
 	INTERLEAVING_NONE,
 	INTERLEAVING_AUTO,
 	INTERLEAVING_240,
-	INTERLEAVING_720,
+	INTERLEAVING_720
 };
 
 #if defined(__DVB_CORE__) || !defined (__KERNEL__)
@@ -380,14 +380,14 @@ struct dvb_frontend_event {
 typedef enum fe_pilot {
 	PILOT_ON,
 	PILOT_OFF,
-	PILOT_AUTO,
+	PILOT_AUTO
 } fe_pilot_t;
 
 typedef enum fe_rolloff {
 	ROLLOFF_35, /* Implied value in DVB-S, default for DVB-S2 */
 	ROLLOFF_20,
 	ROLLOFF_25,
-	ROLLOFF_AUTO,
+	ROLLOFF_AUTO
 } fe_rolloff_t;
 
 typedef enum fe_delivery_system {
@@ -409,7 +409,7 @@ typedef enum fe_delivery_system {
 	SYS_DAB,
 	SYS_DVBT2,
 	SYS_TURBO,
-	SYS_DVBC_ANNEX_C,
+	SYS_DVBC_ANNEX_C
 } fe_delivery_system_t;
 
 /* backward compatibility */
@@ -421,31 +421,31 @@ typedef enum fe_delivery_system {
 enum atscmh_sccc_block_mode {
 	ATSCMH_SCCC_BLK_SEP      = 0,
 	ATSCMH_SCCC_BLK_COMB     = 1,
-	ATSCMH_SCCC_BLK_RES      = 2,
+	ATSCMH_SCCC_BLK_RES      = 2
 };
 
 enum atscmh_sccc_code_mode {
 	ATSCMH_SCCC_CODE_HLF     = 0,
 	ATSCMH_SCCC_CODE_QTR     = 1,
-	ATSCMH_SCCC_CODE_RES     = 2,
+	ATSCMH_SCCC_CODE_RES     = 2
 };
 
 enum atscmh_rs_frame_ensemble {
 	ATSCMH_RSFRAME_ENS_PRI   = 0,
-	ATSCMH_RSFRAME_ENS_SEC   = 1,
+	ATSCMH_RSFRAME_ENS_SEC   = 1
 };
 
 enum atscmh_rs_frame_mode {
 	ATSCMH_RSFRAME_PRI_ONLY  = 0,
 	ATSCMH_RSFRAME_PRI_SEC   = 1,
-	ATSCMH_RSFRAME_RES       = 2,
+	ATSCMH_RSFRAME_RES       = 2
 };
 
 enum atscmh_rs_code_mode {
 	ATSCMH_RSCODE_211_187    = 0,
 	ATSCMH_RSCODE_223_187    = 1,
 	ATSCMH_RSCODE_235_187    = 2,
-	ATSCMH_RSCODE_RES        = 3,
+	ATSCMH_RSCODE_RES        = 3
 };
 
 #define NO_STREAM_ID_FILTER	(~0U)
diff --git a/src/zapit/include/zapit/frontend_types.h b/src/zapit/include/zapit/frontend_types.h
index 7e3591c70..3ced4139c 100644
--- a/src/zapit/include/zapit/frontend_types.h
+++ b/src/zapit/include/zapit/frontend_types.h
@@ -76,7 +76,7 @@ typedef enum {
 	//
 	ALL_SAT = ZAPIT_DM_SAT,
 	ALL_CABLE = ZAPIT_DM_CABLE,
-	ALL_TERR = ZAPIT_DM_TERR,
+	ALL_TERR = ZAPIT_DM_TERR
 } delivery_system_t;
 
 typedef enum {