Index: libcfa/src/bits/containers.hfa
===================================================================
--- libcfa/src/bits/containers.hfa	(revision 1830a8657cb302a89a7ca045bee06baa48b18101)
+++ libcfa/src/bits/containers.hfa	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
@@ -151,5 +151,5 @@
 		}
 
-		void append( __queue(T) & this, T * val ) with( this ) {
+		void append( __queue(T) & this, T * val ) with(this) {
 			verify(this.tail != 0p);
 			verify(*this.tail == 1p);
@@ -161,8 +161,8 @@
 		T * peek( __queue(T) & this ) {
 			verify(*this.tail == 1p);
-			T * front = this.head;
-			if( front != 1p ) {
+			T * frontnode = this.head;
+			if( frontnode != 1p ) {
 				verify(*this.tail == 1p);
-				return front;
+				return frontnode;
 			}
 			verify(*this.tail == 1p);
Index: libcfa/src/bits/sequence.hfa
===================================================================
--- libcfa/src/bits/sequence.hfa	(revision 1830a8657cb302a89a7ca045bee06baa48b18101)
+++ libcfa/src/bits/sequence.hfa	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
@@ -30,7 +30,7 @@
 	// PUBLIC
 
-	void ?{}( Seqable & sq ) with( sq ) {
+	void ?{}( Seqable & sq ) {
 		((Colable &)sq){};
-		back = 0p;
+		sq.back = 0p;
 	} // post: ! listed()
 
Index: libcfa/src/fstream.hfa
===================================================================
--- libcfa/src/fstream.hfa	(revision 1830a8657cb302a89a7ca045bee06baa48b18101)
+++ libcfa/src/fstream.hfa	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
@@ -16,4 +16,5 @@
 #pragma once
 
+#include "bits/weakso_locks.hfa"
 #include "iostream.hfa"
 #include <exception.hfa>
@@ -34,4 +35,5 @@
 	char $separator[sepSize];
 	char $tupleSeparator[sepSize];
+//	multiple_acquisition_lock lock;
 }; // ofstream
 
Index: tests/includes/.expect/vector-containers.txt
===================================================================
--- tests/includes/.expect/vector-containers.txt	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
+++ tests/includes/.expect/vector-containers.txt	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
@@ -0,0 +1,1 @@
+done
Index: tests/includes/.expect/vector-fstream.txt
===================================================================
--- tests/includes/.expect/vector-fstream.txt	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
+++ tests/includes/.expect/vector-fstream.txt	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
@@ -0,0 +1,1 @@
+done
Index: tests/includes/.expect/vector-sequence.txt
===================================================================
--- tests/includes/.expect/vector-sequence.txt	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
+++ tests/includes/.expect/vector-sequence.txt	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
@@ -0,0 +1,1 @@
+done
Index: tests/includes/about.txt
===================================================================
--- tests/includes/about.txt	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
+++ tests/includes/about.txt	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
@@ -0,0 +1,4 @@
+The "includes" tests verify that combinations of includes can coexist in one compile unit, without
+causing false compile errors.
+
+The combination of includes at the top of each *.cfa is the SUT; that *.cfa is named accordingly.
Index: tests/includes/vector-containers.cfa
===================================================================
--- tests/includes/vector-containers.cfa	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
+++ tests/includes/vector-containers.cfa	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
@@ -0,0 +1,6 @@
+#include <vector.hfa>
+#include <bits/containers.hfa>
+
+int main() {
+    printf("done\n");
+}
Index: tests/includes/vector-fstream.cfa
===================================================================
--- tests/includes/vector-fstream.cfa	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
+++ tests/includes/vector-fstream.cfa	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
@@ -0,0 +1,6 @@
+#include <vector.hfa>
+#include <fstream.hfa>
+
+int main() {
+    printf("done\n");
+}
Index: tests/includes/vector-sequence.cfa
===================================================================
--- tests/includes/vector-sequence.cfa	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
+++ tests/includes/vector-sequence.cfa	(revision d0502a3aee721f5f4e468913c7db6c2aab56025c)
@@ -0,0 +1,6 @@
+#include <vector.hfa>
+#include <bits/sequence.hfa>
+
+int main() {
+    printf("done\n");
+}
