diff --git a/headers/private/file_systems/QueryParser.h b/headers/private/file_systems/QueryParser.h
index beb6f703d6..083e7bea35 100644
--- a/headers/private/file_systems/QueryParser.h
+++ b/headers/private/file_systems/QueryParser.h
@@ -1108,7 +1108,7 @@ template<typename QueryPolicy>
 void
 Operator<QueryPolicy>::PrintToStream()
 {
-	D(__out("( "));
+	QUERY_D(__out("( "));
 	if (fLeft != NULL)
 		fLeft->PrintToStream();
 
@@ -1118,12 +1118,12 @@ Operator<QueryPolicy>::PrintToStream()
 		case OP_AND: op = "AND"; break;
 		default: op = "?"; break;
 	}
-	D(__out(" %s ", op));
+	QUERY_D(__out(" %s ", op));
 
 	if (fRight != NULL)
 		fRight->PrintToStream();
 
-	D(__out(" )"));
+	QUERY_D(__out(" )"));
 }
 
 
@@ -1140,7 +1140,7 @@ Equation<QueryPolicy>::PrintToStream()
 		case OP_LESS_THAN: symbol = "<"; break;
 		case OP_LESS_THAN_OR_EQUAL: symbol = "<="; break;
 	}
-	D(__out("[\"%s\" %s \"%s\"]", fAttribute, symbol, fString));
+	QUERY_D(__out("[\"%s\" %s \"%s\"]", fAttribute, symbol, fString));
 }
 
 #endif	// DEBUG_QUERY
@@ -1162,7 +1162,7 @@ Expression<QueryPolicy>::Expression(char* expr)
 	}
 	QUERY_D(if (fTerm != NULL) {
 		fTerm->PrintToStream();
-		D(__out("\n"));
+		QUERY_D(__out("\n"));
 		if (*expr != '\0')
 			PRINT(("Unexpected end of string: \"%s\"!\n", expr));
 	});