wip

1 files changed, 1 insertions, 2 deletions

diff --git a/fluid/io/Code_Writer.h b/fluid/io/Code_Writer.h
index f2ca32a3e..bd99395e5 100644
--- a/fluid/io/Code_Writer.h
+++ b/fluid/io/Code_Writer.h
@@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <string>
 
 class Node;
 
@@ -157,7 +156,7 @@ public:
   int write_code(const char *cfile, const char *hfile, bool to_codeview=false);
   void write_public(int state); // writes pubic:/private: as needed
 
-  void tag(proj::Mergeback::Tag prev_type, proj::Mergeback::Tag next_type, unsigned short uid);
+  void tag(Mergeback::Tag prev_type, Mergeback::Tag next_type, unsigned short uid);
 
   static unsigned long block_crc(const void *data, int n=-1, unsigned long in_crc=0, bool *inout_line_start=0);
 };