Index: src/Common/Assert.cc
===================================================================
--- src/Common/Assert.cc	(revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd)
+++ src/Common/Assert.cc	(revision b706db104eccacb1970696b4e147de19fdfb616d)
@@ -14,8 +14,7 @@
 //
 
-#include <assert.h>
-#include <cstdarg>										// varargs
-#include <cstdio>										// fprintf
-#include <cstdlib>										// abort
+#include <cstdarg>  // for va_end, va_list, va_start
+#include <cstdio>   // for fprintf, stderr, vfprintf
+#include <cstdlib>  // for abort
 
 extern const char * __progname;							// global name of running executable (argv[0])
Index: src/Common/SemanticError.cc
===================================================================
--- src/Common/SemanticError.cc	(revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd)
+++ src/Common/SemanticError.cc	(revision b706db104eccacb1970696b4e147de19fdfb616d)
@@ -14,13 +14,12 @@
 //
 
-#include <iostream>
-#include <list>
-#include <string>
-#include <algorithm>
-#include <iterator>
+#include <cstdio>            // for fileno, stderr
+#include <unistd.h>          // for isatty
+#include <iostream>          // for basic_ostream, operator<<, ostream
+#include <list>              // for list, _List_iterator
+#include <string>            // for string, operator<<, operator+, to_string
 
+#include "Common/utility.h"  // for to_string, CodeLocation (ptr only)
 #include "SemanticError.h"
-
-#include <unistd.h>
 
 inline const std::string& error_str() {
Index: src/Common/SemanticError.h
===================================================================
--- src/Common/SemanticError.h	(revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd)
+++ src/Common/SemanticError.h	(revision b706db104eccacb1970696b4e147de19fdfb616d)
@@ -17,11 +17,10 @@
 #define SEMANTICERROR_H
 
-#include <exception>
-#include <string>
-#include <sstream>
-#include <list>
-#include <iostream>
+#include <exception>  // for exception
+#include <iostream>   // for ostream
+#include <list>       // for list
+#include <string>     // for string
 
-#include "utility.h"
+#include "utility.h"  // for CodeLocation, toString
 
 struct error {