diff --git a/depot.h b/depot.h
index c3805ef5fb..0c69ab7000 100644
--- a/depot.h
+++ b/depot.h
@@ -17,7 +17,7 @@ struct Depot {
 	DepotID index;
 };
 
-DECLARE_POOL(Depot, Depot, 3, 8000);
+DECLARE_POOL(Depot, Depot, 3, 8000)
 
 /**
  * Check if a depot really exists.
diff --git a/newgrf_spritegroup.c b/newgrf_spritegroup.c
index 3209b20523..48985a2c5b 100644
--- a/newgrf_spritegroup.c
+++ b/newgrf_spritegroup.c
@@ -11,7 +11,7 @@
 static void SpriteGroupPoolCleanBlock(uint start_item, uint end_item);
 
 static uint _spritegroup_count = 0;
-STATIC_POOL(SpriteGroup, SpriteGroup, 4, 8000, NULL, SpriteGroupPoolCleanBlock);
+STATIC_POOL(SpriteGroup, SpriteGroup, 4, 8000, NULL, SpriteGroupPoolCleanBlock)
 
 static void DestroySpriteGroup(SpriteGroup *group)
 {
diff --git a/yapf/array.hpp b/yapf/array.hpp
index 0d330aeed7..04fbe09831 100644
--- a/yapf/array.hpp
+++ b/yapf/array.hpp
@@ -18,9 +18,9 @@ protected:
 	CSuperArray     m_a; ///< array of arrays of items
 
 public:
-	ST_CONST(int, Tblock_size = Tblock_size_); ///< block size is now visible from outside
-	ST_CONST(int, Tnum_blocks = Tnum_blocks_); ///< number of blocks is now visible from outside
-	ST_CONST(int, Tcapacity = Tblock_size * Tnum_blocks); ///< total max number of items
+	ST_CONST(int, Tblock_size = Tblock_size_) ///< block size is now visible from outside
+	ST_CONST(int, Tnum_blocks = Tnum_blocks_) ///< number of blocks is now visible from outside
+	ST_CONST(int, Tcapacity = Tblock_size * Tnum_blocks) ///< total max number of items
 
 	/** implicit constructor */
 	FORCEINLINE CArrayT() { }
diff --git a/yapf/blob.hpp b/yapf/blob.hpp
index 8c2da84a46..53e7e1ff55 100644
--- a/yapf/blob.hpp
+++ b/yapf/blob.hpp
@@ -32,7 +32,7 @@ protected:
 	} ptr_u;
 
 public:
-	ST_CONST(int, Ttail_reserve = 4); // four extra bytes will be always allocated and zeroed at the end
+	ST_CONST(int, Ttail_reserve = 4) // four extra bytes will be always allocated and zeroed at the end
 
 	FORCEINLINE CBlobBaseSimple() { InitEmpty(); }
 	FORCEINLINE CBlobBaseSimple(const CBlobBaseSimple& src)
@@ -169,7 +169,7 @@ public:
 	typedef Titem_ Titem;
 	typedef Tbase_ Tbase;
 
-	ST_CONST(int, Titem_size = sizeof(Titem));
+	ST_CONST(int, Titem_size = sizeof(Titem))
 
 	FORCEINLINE CBlobT() : Tbase() {}
 	FORCEINLINE CBlobT(const Tbase& src) : Tbase(src) {assert((RawSize() % Titem_size) == 0);}
diff --git a/yapf/fixedsizearray.hpp b/yapf/fixedsizearray.hpp
index 4ecedcd2f6..e81b6a2587 100644
--- a/yapf/fixedsizearray.hpp
+++ b/yapf/fixedsizearray.hpp
@@ -24,9 +24,9 @@ struct CFixedSizeArrayT {
 	// make types and constants visible from outside
 	typedef Titem_ Titem; // type of array item
 
-	ST_CONST(int, Tcapacity = Tcapacity_); // the array capacity (maximum size)
-	ST_CONST(int, TitemSize = sizeof(Titem_)); // size of item
-	ST_CONST(int, ThdrSize  = sizeof(CHdr)); // size of header
+	ST_CONST(int, Tcapacity = Tcapacity_) // the array capacity (maximum size)
+	ST_CONST(int, TitemSize = sizeof(Titem_)) // size of item
+	ST_CONST(int, ThdrSize  = sizeof(CHdr)) // size of header
 
 	/** Default constructor. Preallocate space for items and header, then initialize header. */
 	CFixedSizeArrayT()
diff --git a/yapf/hashtable.hpp b/yapf/hashtable.hpp
index 3933eb8f10..44ea315e2c 100644
--- a/yapf/hashtable.hpp
+++ b/yapf/hashtable.hpp
@@ -120,8 +120,8 @@ class CHashTableT {
 public:
 	typedef Titem_ Titem;                       // make Titem_ visible from outside of class
 	typedef typename Titem_::Key Tkey;          // make Titem_::Key a property of HashTable
-	ST_CONST(int, Thash_bits = Thash_bits_);    // publish num of hash bits
-	ST_CONST(int, Tcapacity = 1 << Thash_bits); // and num of slots 2^bits
+	ST_CONST(int, Thash_bits = Thash_bits_)    // publish num of hash bits
+	ST_CONST(int, Tcapacity = 1 << Thash_bits) // and num of slots 2^bits
 
 protected:
 	/** each slot contains pointer to the first item in the list,
diff --git a/yapf/track_dir.hpp b/yapf/track_dir.hpp
index e21dd1b2b7..0239f853e3 100644
--- a/yapf/track_dir.hpp
+++ b/yapf/track_dir.hpp
@@ -26,10 +26,10 @@ EXTERN_C_END
 	FORCEINLINE mask_t operator << (mask_t m, int i) {return (mask_t)(((int)m) << i);} \
 	FORCEINLINE mask_t operator >> (mask_t m, int i) {return (mask_t)(((int)m) >> i);}
 
-DECLARE_ENUM_AS_BIT_MASK(TrackBits);
-DECLARE_ENUM_AS_BIT_INDEX(Track, TrackBits);
+DECLARE_ENUM_AS_BIT_MASK(TrackBits)
+DECLARE_ENUM_AS_BIT_INDEX(Track, TrackBits)
 
-DECLARE_ENUM_AS_BIT_MASK(TrackdirBits);
-DECLARE_ENUM_AS_BIT_INDEX(Trackdir, TrackdirBits);
+DECLARE_ENUM_AS_BIT_MASK(TrackdirBits)
+DECLARE_ENUM_AS_BIT_INDEX(Trackdir, TrackdirBits)
 
 #endif /* TRACK_DIR_HPP */
diff --git a/yapf/yapf_settings.h b/yapf/yapf_settings.h
index 77c4f2da44..193714dd12 100644
--- a/yapf/yapf_settings.h
+++ b/yapf/yapf_settings.h
@@ -59,7 +59,7 @@ YS_DEF_BEGIN
 	YS_DEF(uint32, rail_longer_platform_per_tile_penalty)  ///< penalty for longer  station platform than train (per tile)
 	YS_DEF(uint32, rail_shorter_platform_penalty)          ///< penalty for shorter station platform than train
 	YS_DEF(uint32, rail_shorter_platform_per_tile_penalty) ///< penalty for shorter station platform than train (per tile)
-YS_DEF_END;
+YS_DEF_END
 
 #undef YS_DEF_BEGIN
 #undef YS_DEF