remove semicolon after namespace

Class definitions have to end with a semicolon but not namespaces. So
remove this everywhere.

116 files changed, 121 insertions, 137 deletions

diff --git a/src/base/bpm.cpp b/src/base/bpm.cpp
index 429608a1..76361511 100644
--- a/src/base/bpm.cpp
+++ b/src/base/bpm.cpp
@@ -43,4 +43,4 @@ namespace usdx
 	{
 		return second;
 	}
-};
+}
diff --git a/src/base/bpm.hpp b/src/base/bpm.hpp
index 71da5a82..c3aa68a3 100644
--- a/src/base/bpm.hpp
+++ b/src/base/bpm.hpp
@@ -38,6 +38,6 @@ namespace usdx
 		const int get_beat(void) const;
 		const float get_bpm(void) const;
 	};
-};
+}
 
 #endif
diff --git a/src/base/config.cpp b/src/base/config.cpp
index 7a5807af..08a9ba65 100644
--- a/src/base/config.cpp
+++ b/src/base/config.cpp
@@ -95,4 +95,4 @@ namespace usdx
 	{
 		return debug_boxes;
 	}
-};
+}
diff --git a/src/base/config.hpp b/src/base/config.hpp
index 36ee5394..d2f9d8a5 100644
--- a/src/base/config.hpp
+++ b/src/base/config.hpp
@@ -69,7 +69,6 @@ namespace usdx
 		void set_debug_boxes(bool value);
 		bool get_debug_boxes(void) const;
 	};
-};
-
+}
 
 #endif
diff --git a/src/base/lyric_line.cpp b/src/base/lyric_line.cpp
index 8e2494d4..4d454054 100644
--- a/src/base/lyric_line.cpp
+++ b/src/base/lyric_line.cpp
@@ -64,4 +64,4 @@ namespace usdx
 		words.push_back(word);
 	}
 
-};
+}
diff --git a/src/base/lyric_line.hpp b/src/base/lyric_line.hpp
index bf1ae696..92902b9a 100644
--- a/src/base/lyric_line.hpp
+++ b/src/base/lyric_line.hpp
@@ -48,6 +48,6 @@ namespace usdx
 
 		void add_word(LyricWord* word);
 	};
-};
+}
 
 #endif
diff --git a/src/base/lyric_word.cpp b/src/base/lyric_word.cpp
index f53acfb7..f89ed830 100644
--- a/src/base/lyric_word.cpp
+++ b/src/base/lyric_word.cpp
@@ -47,4 +47,4 @@ namespace usdx
 	LyricWord::~LyricWord(void)
 	{
 	}
-};
+}
diff --git a/src/base/lyric_word.hpp b/src/base/lyric_word.hpp
index c58a0b33..95c9473a 100644
--- a/src/base/lyric_word.hpp
+++ b/src/base/lyric_word.hpp
@@ -48,6 +48,6 @@ namespace usdx
 		LyricWord(const char type, const int beat, const int length, const int height, const std::string& lyric);
 		virtual ~LyricWord(void);
 	};
-};
+}
 
 #endif
diff --git a/src/base/ringbuffer.cpp b/src/base/ringbuffer.cpp
index 72b09666..20fb9533 100644
--- a/src/base/ringbuffer.cpp
+++ b/src/base/ringbuffer.cpp
@@ -134,4 +134,4 @@ namespace usdx
 		write_pos = 0;
 		buffer_count = 0;
 	}
-};
+}
diff --git a/src/base/ringbuffer.hpp b/src/base/ringbuffer.hpp
index 44ecc961..4c49011a 100644
--- a/src/base/ringbuffer.hpp
+++ b/src/base/ringbuffer.hpp
@@ -45,6 +45,6 @@ namespace usdx
 		int get_available();
 		void flush(void);
 	};
-};
+}
 
 #endif
diff --git a/src/base/song.cpp b/src/base/song.cpp
index 163694f6..c2ade58f 100644
--- a/src/base/song.cpp
+++ b/src/base/song.cpp
@@ -324,4 +324,4 @@ namespace usdx
 		get_last_lyric_line()->add_word(new LyricWord(type, beat + get_relative_beat(), length, height, lyric));
 	}
 
-};
+}
diff --git a/src/base/song.hpp b/src/base/song.hpp
index a071a558..4fb7e2ae 100644
--- a/src/base/song.hpp
+++ b/src/base/song.hpp
@@ -148,6 +148,6 @@ namespace usdx
 		void new_line(const int line_out, const int line_in);
 		void new_note(const char type, const int beat, const int length, const int height, const std::string& lyric);
 	};
-};
+}
 
 #endif
diff --git a/src/base/songloading/songloader.cpp b/src/base/songloading/songloader.cpp
index a27ba652..fa972cf3 100644
--- a/src/base/songloading/songloader.cpp
+++ b/src/base/songloading/songloader.cpp
@@ -90,4 +90,4 @@ namespace usdx
 			strategies[factory->get_fileextension()] = factory;
 		}
 	}
-};
+}
diff --git a/src/base/songloading/songloader.hpp b/src/base/songloading/songloader.hpp
index 58fd8602..a9ba6802 100644
--- a/src/base/songloading/songloader.hpp
+++ b/src/base/songloading/songloader.hpp
@@ -65,6 +65,6 @@ namespace usdx
 
 		void add_strategy(SongloadingStrategyBaseFactory* strategie);
 	};
-};
+}
 
 #endif
diff --git a/src/base/songloading/songloading_strategy.hpp b/src/base/songloading/songloading_strategy.hpp
index 32ccb690..e7db5b9d 100644
--- a/src/base/songloading/songloading_strategy.hpp
+++ b/src/base/songloading/songloading_strategy.hpp
@@ -51,6 +51,6 @@ namespace usdx
 		virtual Song* load_song(Song* song) = 0;
 		virtual Song* load_header(const boost::filesystem::wpath& filename) = 0;
 	};
-};
+}
 
 #endif
diff --git a/src/base/songloading/songloading_strategy_base_factory.cpp b/src/base/songloading/songloading_strategy_base_factory.cpp
index cf515baa..6b12179c 100644
--- a/src/base/songloading/songloading_strategy_base_factory.cpp
+++ b/src/base/songloading/songloading_strategy_base_factory.cpp
@@ -36,4 +36,4 @@ namespace usdx
 	{
 		return fileextension;
 	}
-};
+}
diff --git a/src/base/songloading/songloading_strategy_base_factory.hpp b/src/base/songloading/songloading_strategy_base_factory.hpp
index 961f50b5..00671b26 100644
--- a/src/base/songloading/songloading_strategy_base_factory.hpp
+++ b/src/base/songloading/songloading_strategy_base_factory.hpp
@@ -48,6 +48,6 @@ namespace usdx
 		virtual SongloadingStrategy *get_songloader(void) = 0;
 		std::string get_fileextension(void);
 	};
-};
+}
 
 #endif
diff --git a/src/base/songloading/songloading_strategy_factory.hpp b/src/base/songloading/songloading_strategy_factory.hpp
index 3d038ead..fe23ea42 100644
--- a/src/base/songloading/songloading_strategy_factory.hpp
+++ b/src/base/songloading/songloading_strategy_factory.hpp
@@ -61,6 +61,6 @@ namespace usdx
 			return songloader;
 		}
 	};
-};
+}
 
 #endif
diff --git a/src/base/songloading/songloading_strategy_txt.cpp b/src/base/songloading/songloading_strategy_txt.cpp
index d7326245..d4966419 100644
--- a/src/base/songloading/songloading_strategy_txt.cpp
+++ b/src/base/songloading/songloading_strategy_txt.cpp
@@ -233,4 +233,4 @@ namespace usdx
 		// fill song
 		return new Song(filename, header_fields);
 	}
-};
+}
diff --git a/src/base/songloading/songloading_strategy_txt.hpp b/src/base/songloading/songloading_strategy_txt.hpp
index 23c21a7a..75c02cc3 100644
--- a/src/base/songloading/songloading_strategy_txt.hpp
+++ b/src/base/songloading/songloading_strategy_txt.hpp
@@ -60,6 +60,6 @@ namespace usdx
 	};
 
 	REGISTER_SONGLOADING_STRATEGY(SongloadingStrategyTxt);
-};
+}
 
 #endif
diff --git a/src/base/songloading/songloading_strategy_xml.cpp b/src/base/songloading/songloading_strategy_xml.cpp
index 64715960..22b18039 100644
--- a/src/base/songloading/songloading_strategy_xml.cpp
+++ b/src/base/songloading/songloading_strategy_xml.cpp
@@ -46,4 +46,4 @@ namespace usdx
 	{
 		return NULL;
 	}
-};
+}
diff --git a/src/base/songloading/songloading_strategy_xml.hpp b/src/base/songloading/songloading_strategy_xml.hpp
index 32ca255b..5540756f 100644
--- a/src/base/songloading/songloading_strategy_xml.hpp
+++ b/src/base/songloading/songloading_strategy_xml.hpp
@@ -44,6 +44,6 @@ namespace usdx
 	};
 
 	REGISTER_SONGLOADING_STRATEGY(SongloadingStrategyXml);
-};
+}
 
 #endif
diff --git a/src/base/stats.hpp b/src/base/stats.hpp
index e8155a2b..942bb51a 100644
--- a/src/base/stats.hpp
+++ b/src/base/stats.hpp
@@ -196,6 +196,6 @@ namespace usdx
 
 		StatResultMostSungBand *get_next();
 	};
-};
+}
 
 #endif
diff --git a/src/base/time.hpp b/src/base/time.hpp
index 9e9eac20..a10449f6 100644
--- a/src/base/time.hpp
+++ b/src/base/time.hpp
@@ -49,6 +49,6 @@ namespace usdx
 		 */
 		static float get_time();
 	};
-};
+}
 
 #endif
diff --git a/src/base/timestamp.cpp b/src/base/timestamp.cpp
index 668abbf9..1e86a8d4 100644
--- a/src/base/timestamp.cpp
+++ b/src/base/timestamp.cpp
@@ -41,4 +41,4 @@ namespace usdx
 	{
 		time = Time::get_time();
 	}
-};
+}
diff --git a/src/base/timestamp.hpp b/src/base/timestamp.hpp
index 18153e9f..e6fc5247 100644
--- a/src/base/timestamp.hpp
+++ b/src/base/timestamp.hpp
@@ -59,6 +59,6 @@ namespace usdx
 		 */
 		void update(void);
 	};
-};
+}
 
 #endif
diff --git a/src/frames/loading_frame.cpp b/src/frames/loading_frame.cpp
index b746e41f..c2e75165 100644
--- a/src/frames/loading_frame.cpp
+++ b/src/frames/loading_frame.cpp
@@ -46,5 +46,4 @@ namespace usdx
 	LoadingFrame::~LoadingFrame()
 	{
 	}
-};
-
+}
diff --git a/src/frames/loading_frame.hpp b/src/frames/loading_frame.hpp
index 0e56a34a..e2393399 100644
--- a/src/frames/loading_frame.hpp
+++ b/src/frames/loading_frame.hpp
@@ -40,7 +40,6 @@ namespace usdx
 		LoadingFrame(Application*);
 		virtual ~LoadingFrame();
 	};
-};
-
+}
 
 #endif
diff --git a/src/menu/application.cpp b/src/menu/application.cpp
index a5b90796..92e6b8a8 100644
--- a/src/menu/application.cpp
+++ b/src/menu/application.cpp
@@ -244,4 +244,4 @@ namespace usdx
 	{
 		return running;
 	}
-};
+}
diff --git a/src/menu/application.hpp b/src/menu/application.hpp
index 151b34ae..a47bd42a 100644
--- a/src/menu/application.hpp
+++ b/src/menu/application.hpp
@@ -81,6 +81,6 @@ namespace usdx
 
 		bool is_running(void) const;
 	};
-};
+}
 
 #endif
diff --git a/src/menu/background.cpp b/src/menu/background.cpp
index 5cd2b90a..4839d05b 100644
--- a/src/menu/background.cpp
+++ b/src/menu/background.cpp
@@ -39,4 +39,4 @@ namespace usdx
 	{
 		return parent;
 	}
-};
+}
diff --git a/src/menu/background.hpp b/src/menu/background.hpp
index a971416c..0a7bee49 100644
--- a/src/menu/background.hpp
+++ b/src/menu/background.hpp
@@ -52,6 +52,6 @@ namespace usdx
 		 */
 		const DrawableControl& get_parent(void) const;
 	};
-};
+}
 
 #endif
diff --git a/src/menu/background_color.cpp b/src/menu/background_color.cpp
index 031ffe26..12ec6c7c 100644
--- a/src/menu/background_color.cpp
+++ b/src/menu/background_color.cpp
@@ -67,4 +67,4 @@ namespace usdx
 		glDisableClientState(GL_VERTEX_ARRAY);
 		glDisableClientState(GL_COLOR_ARRAY);
 	}
-};
+}
diff --git a/src/menu/background_color.hpp b/src/menu/background_color.hpp
index 79059471..4b724982 100644
--- a/src/menu/background_color.hpp
+++ b/src/menu/background_color.hpp
@@ -60,7 +60,6 @@ namespace usdx
 						const RgbColor &color);
 
 	};
-};
-
+}
 
 #endif
diff --git a/src/menu/background_image.cpp b/src/menu/background_image.cpp
index 87ca4c36..7ffb8009 100644
--- a/src/menu/background_image.cpp
+++ b/src/menu/background_image.cpp
@@ -76,4 +76,4 @@ namespace usdx
 		glDisableClientState(GL_VERTEX_ARRAY);
 		glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 	}
-};
+}
diff --git a/src/menu/background_image.hpp b/src/menu/background_image.hpp
index 8b28a2e3..14c034e3 100644
--- a/src/menu/background_image.hpp
+++ b/src/menu/background_image.hpp
@@ -76,7 +76,6 @@ namespace usdx
 
 		virtual ~BackgroundImage();
 	};
-};
-
+}
 
 #endif
diff --git a/src/menu/clipping_helper.cpp b/src/menu/clipping_helper.cpp
index 1a92d3f1..a4cd6e9e 100644
--- a/src/menu/clipping_helper.cpp
+++ b/src/menu/clipping_helper.cpp
@@ -76,4 +76,4 @@ namespace usdx
 			glDisable(GL_SCISSOR_TEST);
 		}
 	}
-};
+}
diff --git a/src/menu/clipping_helper.hpp b/src/menu/clipping_helper.hpp
index cbcf7320..5a18e94b 100644
--- a/src/menu/clipping_helper.hpp
+++ b/src/menu/clipping_helper.hpp
@@ -71,6 +71,6 @@ namespace usdx
 		ClippingHelper(const Container*, const Rectangle<int>&);
 		virtual ~ClippingHelper();
 	};
-};
+}
 
 #endif
diff --git a/src/menu/container.cpp b/src/menu/container.cpp
index 6b7e9180..59cd9531 100644
--- a/src/menu/container.cpp
+++ b/src/menu/container.cpp
@@ -167,4 +167,4 @@ namespace usdx
 
 		return this;
 	}
-};
+}
diff --git a/src/menu/container.hpp b/src/menu/container.hpp
index 67bbb3c4..046aa045 100644
--- a/src/menu/container.hpp
+++ b/src/menu/container.hpp
@@ -112,7 +112,7 @@ namespace usdx
 		 */
 		boost::signals2::signal<void ()> window_coords_change;
 	};
-};
+}
 
 
 #endif
diff --git a/src/menu/control.cpp b/src/menu/control.cpp
index ca7ad610..dd3c8af9 100644
--- a/src/menu/control.cpp
+++ b/src/menu/control.cpp
@@ -81,4 +81,4 @@ namespace usdx
 	{
 		slaves.remove(slave);
 	}
-};
+}
diff --git a/src/menu/control.hpp b/src/menu/control.hpp
index a4314579..4000a5df 100644
--- a/src/menu/control.hpp
+++ b/src/menu/control.hpp
@@ -68,6 +68,6 @@ namespace usdx
 		 */
 		const Control* get_owner(void) const;
 	};
-};
+}
 
 #endif
diff --git a/src/menu/drawable.cpp b/src/menu/drawable.cpp
index c78bbfa6..796730e0 100644
--- a/src/menu/drawable.cpp
+++ b/src/menu/drawable.cpp
@@ -35,7 +35,7 @@ namespace usdx
 		if (visible) {
 			draw();
 		}
-	};
+	}
 
 	void Drawable::set_visible(bool value)
 	{
@@ -46,4 +46,4 @@ namespace usdx
 	{
 		return visible;
 	}
-};
+}
diff --git a/src/menu/drawable.hpp b/src/menu/drawable.hpp
index 08471471..575295fa 100644
--- a/src/menu/drawable.hpp
+++ b/src/menu/drawable.hpp
@@ -70,6 +70,6 @@ namespace usdx
 		 */
 		virtual const bool is_visible(void) const;
 	};
-};
+}
 
 #endif
diff --git a/src/menu/drawable_control.cpp b/src/menu/drawable_control.cpp
index f30980cb..5d450bb6 100644
--- a/src/menu/drawable_control.cpp
+++ b/src/menu/drawable_control.cpp
@@ -299,4 +299,4 @@ namespace usdx
 	{
 		on_mouse_dbl_click(button, p);
 	}
-};
+}
diff --git a/src/menu/drawable_control.hpp b/src/menu/drawable_control.hpp
index 0aa64cb8..f5aa10c2 100644
--- a/src/menu/drawable_control.hpp
+++ b/src/menu/drawable_control.hpp
@@ -162,6 +162,6 @@ namespace usdx
 		boost::signals2::signal<void (uint8_t, const Point<int>&)> on_mouse_dbl_click;
 
 	};
-};
+}
 
 #endif
diff --git a/src/menu/event_manager.cpp b/src/menu/event_manager.cpp
index 5b2e49df..57182fbd 100644
--- a/src/menu/event_manager.cpp
+++ b/src/menu/event_manager.cpp
@@ -114,5 +114,4 @@ namespace usdx
 			}
 		}
 	}
-};
-
+}
diff --git a/src/menu/event_manager.hpp b/src/menu/event_manager.hpp
index 5f02e66d..e8d42c3d 100644
--- a/src/menu/event_manager.hpp
+++ b/src/menu/event_manager.hpp
@@ -128,7 +128,6 @@ namespace usdx
 		boost::signals2::signal<void (uint8_t, const Point<int>&)> mouse_down;
 		boost::signals2::signal<void (uint8_t, const Point<int>&)> mouse_up;
 	};
-};
-
+}
 
 #endif
diff --git a/src/menu/frame.cpp b/src/menu/frame.cpp
index ef12fef1..f86b6b2b 100644
--- a/src/menu/frame.cpp
+++ b/src/menu/frame.cpp
@@ -60,4 +60,4 @@ namespace usdx
 			c->setFrame(self);
 		}
 	}
-};
+}
diff --git a/src/menu/frame.hpp b/src/menu/frame.hpp
index a67c0354..f6a25f58 100644
--- a/src/menu/frame.hpp
+++ b/src/menu/frame.hpp
@@ -55,7 +55,7 @@ namespace usdx
 
 		virtual ~Frame();
 	};
-};
 
+}
 
 #endif
diff --git a/src/menu/gl_delayed_allocation.cpp b/src/menu/gl_delayed_allocation.cpp
index f30b15d5..bf4e7986 100644
--- a/src/menu/gl_delayed_allocation.cpp
+++ b/src/menu/gl_delayed_allocation.cpp
@@ -91,4 +91,4 @@ namespace usdx
 			dispose_done.notify_all();
 		}
 	}
-};
+}
diff --git a/src/menu/gl_delayed_allocation.hpp b/src/menu/gl_delayed_allocation.hpp
index 92fe3600..d32c2109 100644
--- a/src/menu/gl_delayed_allocation.hpp
+++ b/src/menu/gl_delayed_allocation.hpp
@@ -60,6 +60,6 @@ namespace usdx
 		virtual void enable(void);
 		virtual void disable(void);
 	};
-};
+}
 
 #endif
diff --git a/src/menu/modelview_matrix_cache.cpp b/src/menu/modelview_matrix_cache.cpp
index 180f8af4..f8e44fb5 100644
--- a/src/menu/modelview_matrix_cache.cpp
+++ b/src/menu/modelview_matrix_cache.cpp
@@ -40,4 +40,4 @@ namespace usdx
 	{
 		glLoadMatrixf(cache);
 	}
-};
+}
diff --git a/src/menu/modelview_matrix_cache.hpp b/src/menu/modelview_matrix_cache.hpp
index 766ac46a..65dc4e1b 100644
--- a/src/menu/modelview_matrix_cache.hpp
+++ b/src/menu/modelview_matrix_cache.hpp
@@ -40,6 +40,6 @@ namespace usdx
 
 		void restore(void) const;
  	};
-};
+}
 
 #endif
diff --git a/src/menu/mouse_event.cpp b/src/menu/mouse_event.cpp
index 71508667..814e179c 100644
--- a/src/menu/mouse_event.cpp
+++ b/src/menu/mouse_event.cpp
@@ -80,4 +80,4 @@ namespace usdx
 
 		return event;
 	}
-};
+}
diff --git a/src/menu/mouse_event.hpp b/src/menu/mouse_event.hpp
index ecb1e4ae..5e783a25 100644
--- a/src/menu/mouse_event.hpp
+++ b/src/menu/mouse_event.hpp
@@ -57,6 +57,6 @@ namespace usdx
 						Event direction);
 
 	};
-};
+}
 
 #endif
diff --git a/src/menu/mouse_manager.cpp b/src/menu/mouse_manager.cpp
index 3b4eb268..3be6cb1b 100644
--- a/src/menu/mouse_manager.cpp
+++ b/src/menu/mouse_manager.cpp
@@ -136,4 +136,4 @@ namespace usdx
 			last_active = NULL;
 		}
 	}
-};
+}
diff --git a/src/menu/mouse_manager.hpp b/src/menu/mouse_manager.hpp
index fe71ead3..90e896c5 100644
--- a/src/menu/mouse_manager.hpp
+++ b/src/menu/mouse_manager.hpp
@@ -65,6 +65,6 @@ namespace usdx
 		 */
 		void deactivate_control(const DrawableControl* control);
 	};
-};
+}
 
 #endif
diff --git a/src/menu/software_mouse_pointer.cpp b/src/menu/software_mouse_pointer.cpp
index e4d51d8e..39ee1318 100644
--- a/src/menu/software_mouse_pointer.cpp
+++ b/src/menu/software_mouse_pointer.cpp
@@ -156,5 +156,4 @@ namespace usdx
 		boost::shared_lock<boost::shared_mutex> lock(down_mutex);
 		return down;
 	}
-};
-
+}
diff --git a/src/menu/software_mouse_pointer.hpp b/src/menu/software_mouse_pointer.hpp
index ff9fe4a4..49ab53b5 100644
--- a/src/menu/software_mouse_pointer.hpp
+++ b/src/menu/software_mouse_pointer.hpp
@@ -74,7 +74,7 @@ namespace usdx
 
 		bool is_down(void) const;
 	};
-};
+}
 
 
 #endif
diff --git a/src/menu/static.cpp b/src/menu/static.cpp
index 16e378e8..584c02a3 100644
--- a/src/menu/static.cpp
+++ b/src/menu/static.cpp
@@ -187,5 +187,4 @@ namespace usdx
 	{
 		return stroke_width;
 	}
-};
-
+}
diff --git a/src/menu/static.hpp b/src/menu/static.hpp
index d8ba2066..5c115e93 100644
--- a/src/menu/static.hpp
+++ b/src/menu/static.hpp
@@ -74,6 +74,6 @@ namespace usdx
 		virtual void set_stroke_width(const float stroke_width);
 		float get_stroke_width(void) const;
 	};
-};
+}
 
 #endif
diff --git a/src/menu/static_rectangle.cpp b/src/menu/static_rectangle.cpp
index 83cf6487..d5bdea20 100644
--- a/src/menu/static_rectangle.cpp
+++ b/src/menu/static_rectangle.cpp
@@ -50,4 +50,4 @@ namespace usdx
 	{
 		glDrawArrays(GL_QUADS, 0, 4);
 	}
-};
+}
diff --git a/src/menu/static_rectangle.hpp b/src/menu/static_rectangle.hpp
index 7cee1a94..69f402c2 100644
--- a/src/menu/static_rectangle.hpp
+++ b/src/menu/static_rectangle.hpp
@@ -41,7 +41,6 @@ namespace usdx
 		StaticRectangle(const RgbColor& stroke, const Dimension<int>& rect);
 		virtual ~StaticRectangle();
 	};
-};
-
+}
 
 #endif
diff --git a/src/menu/text.cpp b/src/menu/text.cpp
index 37cf99a5..c4cd709a 100644
--- a/src/menu/text.cpp
+++ b/src/menu/text.cpp
@@ -150,5 +150,5 @@ namespace usdx
 	{
 		return auto_size;
 	}
-};
 
+}
diff --git a/src/menu/text.hpp b/src/menu/text.hpp
index d5798c8e..49c42a73 100644
--- a/src/menu/text.hpp
+++ b/src/menu/text.hpp
@@ -108,7 +108,7 @@ namespace usdx
 		void set_auto_size(const bool value);
 		bool get_auto_size(void) const;
 	};
-};
 
+}
 
 #endif
diff --git a/src/menu/texture.cpp b/src/menu/texture.cpp
index 4ad0c39e..27d0a1f3 100644
--- a/src/menu/texture.cpp
+++ b/src/menu/texture.cpp
@@ -131,4 +131,4 @@ namespace usdx
 
 		glDisable(GL_TEXTURE_2D);
 	}
-};
+}
diff --git a/src/menu/texture.hpp b/src/menu/texture.hpp
index 9dfa2fa1..9353ad7e 100644
--- a/src/menu/texture.hpp
+++ b/src/menu/texture.hpp
@@ -90,6 +90,6 @@ namespace usdx
 		virtual void enable(void);
 		virtual void disable(void);
 	};
-};
+}
 
 #endif
diff --git a/src/menu/texture_colorized.cpp b/src/menu/texture_colorized.cpp
index 756bf3f3..2db55596 100644
--- a/src/menu/texture_colorized.cpp
+++ b/src/menu/texture_colorized.cpp
@@ -27,4 +27,4 @@
 namespace usdx
 {
 
-};
+}
diff --git a/src/menu/texture_colorized.hpp b/src/menu/texture_colorized.hpp
index 9259bf55..f2ed406a 100644
--- a/src/menu/texture_colorized.hpp
+++ b/src/menu/texture_colorized.hpp
@@ -45,6 +45,6 @@ namespace usdx
 		TextureColorized();
 		virtual ~TextureColorized();
 	};
-};
+}
 
 #endif
diff --git a/src/menu/texture_transparent.cpp b/src/menu/texture_transparent.cpp
index 252c8cd1..0fde627c 100644
--- a/src/menu/texture_transparent.cpp
+++ b/src/menu/texture_transparent.cpp
@@ -27,4 +27,4 @@
 namespace usdx
 {
 
-};
+}
diff --git a/src/menu/texture_transparent.hpp b/src/menu/texture_transparent.hpp
index 5b575b8e..167228a6 100644
--- a/src/menu/texture_transparent.hpp
+++ b/src/menu/texture_transparent.hpp
@@ -46,6 +46,6 @@ namespace usdx
 		float get_alpha(void) const;
 		void set_alpha(float alpha);
 	};
-};
+}
 
 #endif
diff --git a/src/menu/timer.cpp b/src/menu/timer.cpp
index d091aed5..567860c2 100644
--- a/src/menu/timer.cpp
+++ b/src/menu/timer.cpp
@@ -59,4 +59,4 @@ namespace usdx
 	{
 		ready = true;
 	}
-};
+}
diff --git a/src/menu/timer.hpp b/src/menu/timer.hpp
index a76a4411..d2cd700b 100644
--- a/src/menu/timer.hpp
+++ b/src/menu/timer.hpp
@@ -47,7 +47,7 @@ namespace usdx
 		bool is_ready(void);
 		void abort(void);
 	};
-};
+}
 
 
 #endif
diff --git a/src/menu/vertical_text_alignment.cpp b/src/menu/vertical_text_alignment.cpp
index 5f82e796..85bfbc5a 100644
--- a/src/menu/vertical_text_alignment.cpp
+++ b/src/menu/vertical_text_alignment.cpp
@@ -53,5 +53,5 @@ namespace usdx
 	{
 		offset.set_y(((box.get_height() - font.get_height()) / 2) + font.get_bottom());
 	}
-};
+}
 
diff --git a/src/menu/vertical_text_alignment.hpp b/src/menu/vertical_text_alignment.hpp
index a417df9f..bfa78f5c 100644
--- a/src/menu/vertical_text_alignment.hpp
+++ b/src/menu/vertical_text_alignment.hpp
@@ -75,7 +75,6 @@ namespace usdx
 		virtual void align(Point<int>&, const Rectangle<int>&,
 						   const Dimension<int>&) const;
 	};
-};
-
+}
 
 #endif
diff --git a/src/utils/activatable.hpp b/src/utils/activatable.hpp
index 0142ee0d..d2aadc85 100644
--- a/src/utils/activatable.hpp
+++ b/src/utils/activatable.hpp
@@ -33,6 +33,6 @@ namespace usdx
 		virtual void enable(void) = 0;
 		virtual void disable(void) = 0;
 	};
-};
+}
 
 #endif
diff --git a/src/utils/activator.cpp b/src/utils/activator.cpp
index 19cf257e..f8eb1335 100644
--- a/src/utils/activator.cpp
+++ b/src/utils/activator.cpp
@@ -40,4 +40,4 @@ namespace usdx
 			activatable->disable();
 		}
 	}
-};
+}
diff --git a/src/utils/activator.hpp b/src/utils/activator.hpp
index 681fcbf7..d11d7922 100644
--- a/src/utils/activator.hpp
+++ b/src/utils/activator.hpp
@@ -40,6 +40,6 @@ namespace usdx
 		Activator(Activatable* activatable);
 		virtual ~Activator();
 	};
-};
+}
 
 #endif
diff --git a/src/utils/base_exception.cpp b/src/utils/base_exception.cpp
index 57a96a71..c3020c29 100644
--- a/src/utils/base_exception.cpp
+++ b/src/utils/base_exception.cpp
@@ -39,4 +39,4 @@ namespace usdx
 		return message.c_str();
 	}
 
-};
+}
diff --git a/src/utils/base_exception.hpp b/src/utils/base_exception.hpp
index 8933c1a2..a1ebd444 100644
--- a/src/utils/base_exception.hpp
+++ b/src/utils/base_exception.hpp
@@ -42,6 +42,6 @@ namespace usdx
 		~BaseException() throw ();
 		virtual const char* what() const throw();
 	};
-};
+}
 
 #endif
diff --git a/src/utils/binary_file.cpp b/src/utils/binary_file.cpp
index 536bdc70..6f331bce 100644
--- a/src/utils/binary_file.cpp
+++ b/src/utils/binary_file.cpp
@@ -74,4 +74,4 @@ namespace usdx
 
 		return (void*)content;
 	}
-};
+}
diff --git a/src/utils/binary_file.hpp b/src/utils/binary_file.hpp
index 51665c9c..cfc6a76c 100644
--- a/src/utils/binary_file.hpp
+++ b/src/utils/binary_file.hpp
@@ -46,6 +46,6 @@ namespace usdx
 
 		const void* get_content(void);
 	};
-};
+}
 
 #endif
diff --git a/src/utils/bool_translator.hpp b/src/utils/bool_translator.hpp
index dad43f12..c7d8bfc2 100644
--- a/src/utils/bool_translator.hpp
+++ b/src/utils/bool_translator.hpp
@@ -54,18 +54,16 @@ namespace usdx
 			return boost::optional<internal_type>(b ? "true" : "false");
 		}
 	};
-};
+}
 
 namespace boost {
 	namespace property_tree {
-
 		template<typename Ch, typename Traits, typename Alloc>
 		struct translator_between<std::basic_string< Ch, Traits, Alloc >, bool>
 		{
 			typedef usdx::BoolTranslator type;
 		};
-
-	};
-};
+	}
+}
 
 #endif
diff --git a/src/utils/color/hsv.cpp b/src/utils/color/hsv.cpp
index 11df9ec2..ecb155e6 100644
--- a/src/utils/color/hsv.cpp
+++ b/src/utils/color/hsv.cpp
@@ -102,4 +102,4 @@ namespace usdx
 		return value;
 	}
 
-};
+}
diff --git a/src/utils/color/hsv.hpp b/src/utils/color/hsv.hpp
index 748a9b74..c56b9aee 100644
--- a/src/utils/color/hsv.hpp
+++ b/src/utils/color/hsv.hpp
@@ -61,6 +61,6 @@ namespace usdx
 		uint8_t get_value(void) const;
 	};
 
-};
+}
 
 #endif
diff --git a/src/utils/color/rgb.cpp b/src/utils/color/rgb.cpp
index c43b85c4..224c2ea0 100644
--- a/src/utils/color/rgb.cpp
+++ b/src/utils/color/rgb.cpp
@@ -168,4 +168,4 @@ namespace usdx
 	{
 		return (red == 255) && (green == 255) && (blue == 255);
 	}
-};
+}
diff --git a/src/utils/color/rgb.hpp b/src/utils/color/rgb.hpp
index 6871e452..de96bf13 100644
--- a/src/utils/color/rgb.hpp
+++ b/src/utils/color/rgb.hpp
@@ -62,6 +62,6 @@ namespace usdx
 		bool is_black(void) const;
 		bool is_white(void) const;
 	};
-};
+}
 
 #endif
diff --git a/src/utils/color/rgba.cpp b/src/utils/color/rgba.cpp
index 777bb720..3b669bba 100644
--- a/src/utils/color/rgba.cpp
+++ b/src/utils/color/rgba.cpp
@@ -96,4 +96,4 @@ namespace usdx
 	{
 		return 4;
 	}
-};
+}
diff --git a/src/utils/color/rgba.hpp b/src/utils/color/rgba.hpp
index 5d67a92a..36f1e7a7 100644
--- a/src/utils/color/rgba.hpp
+++ b/src/utils/color/rgba.hpp
@@ -46,6 +46,6 @@ namespace usdx
 		virtual const GLubyte* get_array(size_t len) const;
 		int get_array_comonent_count(void) const;
 	};
-};
+}
 
 #endif
diff --git a/src/utils/dimension.hpp b/src/utils/dimension.hpp
index 85799c38..5f1e871e 100644
--- a/src/utils/dimension.hpp
+++ b/src/utils/dimension.hpp
@@ -77,6 +77,6 @@ namespace usdx
 			height = value;
 		}
 	};
-};
+}
 
 #endif
diff --git a/src/utils/dimension_translator.hpp b/src/utils/dimension_translator.hpp
index 8b34df3b..e3df4fee 100644
--- a/src/utils/dimension_translator.hpp
+++ b/src/utils/dimension_translator.hpp
@@ -64,19 +64,17 @@ namespace usdx
 			return boost::optional<internal_type>(out.str());
 		}
 	};
-};
+}
 
 namespace boost {
 	namespace property_tree {
-
 		template<typename Ch, typename Traits, typename Alloc>
 		struct translator_between<std::basic_string< Ch, Traits, Alloc >, usdx::Dimension<int> >
 		{
 			typedef usdx::DimensionTranslator<int> type;
 		};
-
-	};
-};
+	}
+}
 
 
 #endif
diff --git a/src/utils/disposable.cpp b/src/utils/disposable.cpp
index b77821cd..90f33ca5 100644
--- a/src/utils/disposable.cpp
+++ b/src/utils/disposable.cpp
@@ -49,4 +49,4 @@ namespace usdx
 			disposed = true;
 		}
 	}
-};
+}
diff --git a/src/utils/disposable.hpp b/src/utils/disposable.hpp
index 1f8f2d8a..2f1da372 100644
--- a/src/utils/disposable.hpp
+++ b/src/utils/disposable.hpp
@@ -44,6 +44,6 @@ namespace usdx
 
 		void dispose(void);
 	};
-};
+}
 
 #endif
diff --git a/src/utils/disposer.hpp b/src/utils/disposer.hpp
index 727676cd..9f826d37 100644
--- a/src/utils/disposer.hpp
+++ b/src/utils/disposer.hpp
@@ -52,6 +52,6 @@ namespace usdx
 			delete disposable;
 		}
 	};
-};
+}
 
 #endif
diff --git a/src/utils/file.hpp b/src/utils/file.hpp
index f23ec768..19b28b82 100644
--- a/src/utils/file.hpp
+++ b/src/utils/file.hpp
@@ -35,6 +35,6 @@ namespace usdx
 	public:
 		virtual const std::streamsize get_filesize(void) = 0;
 	};
-};
+}
 
 #endif
diff --git a/src/utils/image.cpp b/src/utils/image.cpp
index 10d4c13b..98a4ab8d 100644
--- a/src/utils/image.cpp
+++ b/src/utils/image.cpp
@@ -90,4 +90,4 @@ namespace usdx
 		const SDL_Surface* s = get_surface();
 		return Dimension<int>(s->w, s->h);
 	}
-};
+}
diff --git a/src/utils/image.hpp b/src/utils/image.hpp
index 3ca973fd..cd9e179f 100644
--- a/src/utils/image.hpp
+++ b/src/utils/image.hpp
@@ -63,6 +63,6 @@ namespace usdx
 		const SDL_Surface* get_surface(void) const;
 		const Dimension<int> get_size(void) const;
 	};
-};
+}
 
 #endif
diff --git a/src/utils/locale_independent_float.cpp b/src/utils/locale_independent_float.cpp
index 435ca404..90221b18 100644
--- a/src/utils/locale_independent_float.cpp
+++ b/src/utils/locale_independent_float.cpp
@@ -89,4 +89,4 @@ namespace usdx
 		*float_value = str_value;
 		return is;
 	}
-};
+}
diff --git a/src/utils/locale_independent_float.hpp b/src/utils/locale_independent_float.hpp
index 619b6801..47111a0f 100644
--- a/src/utils/locale_independent_float.hpp
+++ b/src/utils/locale_independent_float.hpp
@@ -50,6 +50,6 @@ namespace usdx
 	std::istream& operator>> (std::istream& is, LocaleIndependentFloat& float_value);
 	std::istream& operator>> (std::istream& is, LocaleIndependentFloat* float_value);
 
-};
+}
 
 #endif
diff --git a/src/utils/math.hpp b/src/utils/math.hpp
index bd9e4217..2e568a5b 100644
--- a/src/utils/math.hpp
+++ b/src/utils/math.hpp
@@ -61,7 +61,7 @@ namespace usdx
 		 */
 		Math() {};
 	};
-};
+}
 
 
 #endif
diff --git a/src/utils/point.hpp b/src/utils/point.hpp
index f548160a..1ece9697 100644
--- a/src/utils/point.hpp
+++ b/src/utils/point.hpp
@@ -102,6 +102,6 @@ namespace usdx
 			return result;
 		}
 	};
-};
+}
 
 #endif
diff --git a/src/utils/point_3d.hpp b/src/utils/point_3d.hpp
index 1687e6a8..ca4616b2 100644
--- a/src/utils/point_3d.hpp
+++ b/src/utils/point_3d.hpp
@@ -57,7 +57,6 @@ namespace usdx
 			z = value;
 		}
 	};
-
-};
+}
 
 #endif
diff --git a/src/utils/rectangle.hpp b/src/utils/rectangle.hpp
index 33b9c763..9cca9eff 100644
--- a/src/utils/rectangle.hpp
+++ b/src/utils/rectangle.hpp
@@ -184,6 +184,6 @@ namespace usdx
 			return true;
 		}
 	};
-};
+}
 
 #endif
diff --git a/src/utils/text_file.cpp b/src/utils/text_file.cpp
index beaa3d1c..4e813df8 100644
--- a/src/utils/text_file.cpp
+++ b/src/utils/text_file.cpp
@@ -64,4 +64,4 @@ namespace usdx
 
 		return length;
 	}
-};
+}
diff --git a/src/utils/text_file.hpp b/src/utils/text_file.hpp
index 0f06b727..5426f2f2 100644
--- a/src/utils/text_file.hpp
+++ b/src/utils/text_file.hpp
@@ -44,6 +44,6 @@ namespace usdx
 		boost::filesystem::ifstream &stream(void);
 		const std::streamsize get_filesize(void);
 	};
-};
+}
 
 #endif
diff --git a/test/base/ringbuffer.cpp b/test/base/ringbuffer.cpp
index 16060570..ad0e86a2 100644
--- a/test/base/ringbuffer.cpp
+++ b/test/base/ringbuffer.cpp
@@ -180,4 +180,4 @@ namespace usdx
 	};
 
 	CPPUNIT_TEST_SUITE_REGISTRATION(RingBufferTest);
-};
+}
diff --git a/test/base/songloading.cpp b/test/base/songloading.cpp
index 614fb22d..ec5c3699 100644
--- a/test/base/songloading.cpp
+++ b/test/base/songloading.cpp
@@ -131,4 +131,4 @@ namespace usdx
 	};
 
 	CPPUNIT_TEST_SUITE_REGISTRATION(SongloadingTest);
-};
+}
diff --git a/test/base/timestamp.cpp b/test/base/timestamp.cpp
index eba23787..87186d97 100644
--- a/test/base/timestamp.cpp
+++ b/test/base/timestamp.cpp
@@ -65,4 +65,4 @@ namespace usdx
 		log4cpp::Category::getInstance("test.usdx.base.timestamp");
 
 	CPPUNIT_TEST_SUITE_REGISTRATION(TimestampTest);
-};
+}
diff --git a/test/menu/application.cpp b/test/menu/application.cpp
index b8757e53..daa68ac2 100644
--- a/test/menu/application.cpp
+++ b/test/menu/application.cpp
@@ -80,4 +80,4 @@ namespace usdx
 		log4cpp::Category::getInstance("test.usdx.menu.application");
 
 	CPPUNIT_TEST_SUITE_REGISTRATION(ApplicationTest);
-};
+}
diff --git a/test/utils/color/hsv.cpp b/test/utils/color/hsv.cpp
index 0dda6719..803f9ec5 100644
--- a/test/utils/color/hsv.cpp
+++ b/test/utils/color/hsv.cpp
@@ -84,4 +84,4 @@ namespace usdx
 
 	CPPUNIT_TEST_SUITE_REGISTRATION(HsvColorTest);
 
-};
+}
diff --git a/test/utils/color/rgb.cpp b/test/utils/color/rgb.cpp
index 68037973..932be8b4 100644
--- a/test/utils/color/rgb.cpp
+++ b/test/utils/color/rgb.cpp
@@ -85,4 +85,4 @@ namespace usdx
 
 	CPPUNIT_TEST_SUITE_REGISTRATION(RgbColorTest);
 
-};
+}
diff --git a/test/utils/image.cpp b/test/utils/image.cpp
index f94e9afe..8aeb57c6 100644
--- a/test/utils/image.cpp
+++ b/test/utils/image.cpp
@@ -106,4 +106,4 @@ namespace usdx
 		log4cpp::Category::getInstance("test.usdx.utils.image");
 
 	CPPUNIT_TEST_SUITE_REGISTRATION(ImageTest);
-};
+}
diff --git a/test/utils/math.cpp b/test/utils/math.cpp
index 6a6a11d6..e97e200a 100644
--- a/test/utils/math.cpp
+++ b/test/utils/math.cpp
@@ -154,4 +154,4 @@ namespace usdx
 		log4cpp::Category::getInstance("test.usdx.utils.math");
 
 	CPPUNIT_TEST_SUITE_REGISTRATION(MathTest);
-};
+}
diff --git a/test/utils/point.cpp b/test/utils/point.cpp
index 6284ea2c..e7f3f918 100644
--- a/test/utils/point.cpp
+++ b/test/utils/point.cpp
@@ -103,4 +103,4 @@ namespace usdx
 		log4cpp::Category::getInstance("test.usdx.utils.point");
 
 	CPPUNIT_TEST_SUITE_REGISTRATION(PointTest);
-};
+}
diff --git a/test/utils/rectangle.cpp b/test/utils/rectangle.cpp
index 2fa96aef..9064bbff 100644
--- a/test/utils/rectangle.cpp
+++ b/test/utils/rectangle.cpp
@@ -88,4 +88,4 @@ namespace usdx
 		log4cpp::Category::getInstance("test.usdx.utils.rectangle");
 
 	CPPUNIT_TEST_SUITE_REGISTRATION(RectangleTest);
-};
+}