#include <string>
 #include <fstream>
 
-#include <tut/tut.hpp>
+#include "tut/tut.hpp"
 
-#include "conffiles.h"
+#include "stg/conffiles.h"
 
 namespace tut
 {
         set_test_name("Check empty lines and comments");
 
         {
-            ofstream f("/tmp/test.cf");
+            std::ofstream f("/tmp/test.cf");
 
-            ensure("Correct construction (part 3)", f);
+            ensure("Correct construction (part 3)", static_cast<bool>(f));
 
             f << "\n"
               << "a=a-string# a string\n"