diff --git a/uppsrc/CppBase/ppfile.cpp b/uppsrc/CppBase/ppfile.cpp
index 3935c4298..fc5e6fd12 100644
--- a/uppsrc/CppBase/ppfile.cpp
+++ b/uppsrc/CppBase/ppfile.cpp
@@ -456,6 +456,7 @@ String GetIncludePath(const String& s, const String& filedir)
 
 void MakePP(const Index<String>& paths)
 {
+	LLOG("MakePP " << paths);
 	Vector<String> todo;
 	Vector<PPFile *> pp;
 	for(int i = 0; i < paths.GetCount(); i++) {
@@ -477,6 +478,7 @@ void MakePP(const Index<String>& paths)
 const PPFile& GetPPFile(const char *path)
 {
 	LTIMING("GetPPFile");
+	LLOG("GetPPFile " << path);
 	static PPFile zero;
 	return sPPfile.Get(path, zero);
 }
diff --git a/uppsrc/CppBase/srcfiles.cpp b/uppsrc/CppBase/srcfiles.cpp
index 81822db7d..fffccbbbb 100644
--- a/uppsrc/CppBase/srcfiles.cpp
+++ b/uppsrc/CppBase/srcfiles.cpp
@@ -4,6 +4,7 @@
 namespace Upp {
 
 #define LTIMING(x) // DTIMING(x)
+#define LLOG(x) // DLOG(x)
 
 static VectorMap<String, String> sSrcFile;
 static Index<uint64>             sIncludes;
@@ -42,6 +43,7 @@ const VectorMap<String, String>& GetAllSourceMasters()
 void GatherSources(const String& master_path, const String& path_, Vector<int>& parents)
 {
 	String path = NormalizeSourcePath(path_);
+	LLOG("--- GatherSources " << master_path << " " << path);
 	if(sSrcFile.Find(path) >= 0)
 		return;
 	int ii = sSrcFile.GetCount();
@@ -51,8 +53,8 @@ void GatherSources(const String& master_path, const String& path_, Vector<int>&
 	parents.Add(ii);
 	const PPFile& f = GetPPFile(path);
 	Index<String> todo;
-	for(int i = 0; i < f.includes.GetCount(); i++) {
-		String p = GetIncludePath(f.includes[i], GetFileFolder(path));
+	for(String inc : f.includes) {
+		String p = GetIncludePath(inc, GetFileFolder(path));
 		if(p.GetCount())
 			todo.FindAdd(p);
 	}
@@ -66,7 +68,8 @@ void GatherSources(const String& path)
 {
 	LTIMING("GatherSources");
 	Vector<int> parents;
-	MakePP({ path });
+	LLOG("=== GatherSources " << path);
+	MakePP({ NormalizeSourcePath(path) });
 	GatherSources(NormalizeSourcePath(path), path, parents);
 }
 
diff --git a/uppsrc/ide/Browser/Base.cpp b/uppsrc/ide/Browser/Base.cpp
index 795353085..313d14797 100644
--- a/uppsrc/ide/Browser/Base.cpp
+++ b/uppsrc/ide/Browser/Base.cpp
@@ -242,7 +242,7 @@ void BaseInfoSync(Progress& pi)
 	pi.SetText("Gathering files");
 	pi.SetTotal(wspc.GetCount());
 	
-	for(int pass = 0; pass < 2; pass++)
+	for(int pass = 0; pass < 2; pass++) // Ignore headers in the first pass to get correct master files
 		for(int i = 0; i < wspc.GetCount(); i++) {
 			pi.Step();
 			const Package& pk = wspc.GetPackage(i);