diff --git a/uppsrc/CppBase/CppBase.h b/uppsrc/CppBase/CppBase.h
index c76803a7c..a17542cfe 100644
--- a/uppsrc/CppBase/CppBase.h
+++ b/uppsrc/CppBase/CppBase.h
@@ -415,8 +415,6 @@ struct CppItem {
 String CppItemKindAsString(int kind);
 
 int FindItem(const Array<CppItem>& x, const String& qitem);
-//int GetCount(const Array<CppItem>& x, int i);
-//int FindNext(const Array<CppItem>& x, int i);
 int FindName(const Array<CppItem>& x, const String& name, int i = 0);
 
 struct CppBase : ArrayMap<String, Array<CppItem> > {
diff --git a/uppsrc/CppBase/cpp.cpp b/uppsrc/CppBase/cpp.cpp
index 52f898832..0f3892609 100644
--- a/uppsrc/CppBase/cpp.cpp
+++ b/uppsrc/CppBase/cpp.cpp
@@ -171,6 +171,8 @@ void Cpp::DoFlatInclude(const String& header_path)
 	}
 }
 
+#define IGNORE_ELSE
+
 void Cpp::Do(const String& sourcefile, Stream& in, const String& currentfile, bool get_macros)
 {
 	if(visited.Find(currentfile) >= 0 || visited.GetCount() > 20000)