diff --git a/src/misc/dbg_helpers.cpp b/src/misc/dbg_helpers.cpp
index 3dc7f91d4a..561de50f33 100644
--- a/src/misc/dbg_helpers.cpp
+++ b/src/misc/dbg_helpers.cpp
@@ -1,4 +1,4 @@
-/* $Id:$ */
+/* $Id$ */
 
 /** @file dbg_helpers.cpp */
 #include "../stdafx.h"
diff --git a/src/misc/dbg_helpers.h b/src/misc/dbg_helpers.h
index 7aecd9a02b..65bf08a5c2 100644
--- a/src/misc/dbg_helpers.h
+++ b/src/misc/dbg_helpers.h
@@ -1,4 +1,4 @@
-/* $Id:$ */
+/* $Id$ */
 
 /** @file dbg_helpers.h */
 
@@ -67,7 +67,7 @@ inline CStrA ComposeNameT(E value, T &t, const char* t_unk, E val_inv, const cha
 	} else if (value == 0) {
 		out = "<none>";
 	} else {
-		for (int i = 0; i < ArrayT<T>::length; i++) {
+		for (size_t i = 0; i < ArrayT<T>::length; i++) {
 			if ((value & (1 << i)) == 0) continue;
 			out.AddFormat("%s%s", (out.Size() > 0 ? "+" : ""), t[i]);
 			value &= ~(E)(1 << i);
diff --git a/src/yapf/yapf.hpp b/src/yapf/yapf.hpp
index 2e107b0522..f98a7c6073 100644
--- a/src/yapf/yapf.hpp
+++ b/src/yapf/yapf.hpp
@@ -74,6 +74,7 @@ typedef CPerfStartFake CPerfStart;
 
 #include "../misc/crc32.hpp"
 #include "../misc/blob.hpp"
+#include "../misc/str.hpp"
 #include "../misc/fixedsizearray.hpp"
 #include "../misc/array.hpp"
 #include "../misc/hashtable.hpp"