diff --git a/src/debug.cpp b/src/debug.cpp
index c0132eae11..f7e812a5f9 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -33,14 +33,14 @@ using support::isStrInt;
 
 namespace {
 
-struct error_item {
+struct ErrorItem {
 	Debug::type level;
 	char const * name;
 	char const * desc;
 };
 
 
-error_item errorTags[] = {
+ErrorItem errorTags[] = {
 	{ Debug::NONE,      "none",      N_("No debugging message")},
 	{ Debug::INFO,      "info",      N_("General information")},
 	{ Debug::INIT,      "init",      N_("Program initialisation")},
@@ -72,7 +72,7 @@ error_item errorTags[] = {
 };
 
 
-int const numErrorTags = sizeof(errorTags)/sizeof(error_item);
+int const numErrorTags = sizeof(errorTags)/sizeof(errorTags[0]);
 
 } // namespace anon
 
diff --git a/src/debug.h b/src/debug.h
index f6a7f88cf3..c955514f84 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -120,12 +120,12 @@ typedef basic_debugstream<Debug> LyXErr;
 
 extern LyXErr lyxerr;
 
-} // namespace lyx
-
 #define LYXERR(type, msg) \
 	do { \
 		if (!lyx::lyxerr.debugging(type)) {} else lyx::lyxerr << msg << std::endl; \
 	} while (0)
 
 
+} // namespace lyx
+
 #endif