diff --git a/src/base/loader/symtab.cc b/src/base/loader/symtab.cc
index 2a23661d88..c2c53cc1e0 100644
--- a/src/base/loader/symtab.cc
+++ b/src/base/loader/symtab.cc
@@ -30,14 +30,9 @@
 
 #include <fstream>
 #include <iostream>
-#include <string>
-#include <vector>
 
 #include "base/logging.hh"
 #include "base/str.hh"
-#include "base/trace.hh"
-#include "base/types.hh"
-#include "sim/serialize.hh"
 
 namespace Loader
 {
diff --git a/src/base/loader/symtab.hh b/src/base/loader/symtab.hh
index 1e99fecd71..a0203a6929 100644
--- a/src/base/loader/symtab.hh
+++ b/src/base/loader/symtab.hh
@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __SYMTAB_HH__
-#define __SYMTAB_HH__
+#ifndef __BASE_LOADER_SYMTAB_HH__
+#define __BASE_LOADER_SYMTAB_HH__
 
 #include <functional>
 #include <iosfwd>
@@ -36,7 +36,6 @@
 #include <string>
 #include <vector>
 
-#include "base/trace.hh"
 #include "base/types.hh"
 #include "sim/serialize.hh"
 
@@ -239,4 +238,4 @@ extern SymbolTable debugSymbolTable;
 
 } // namespace Loader
 
-#endif // __SYMTAB_HH__
+#endif // __BASE_LOADER_SYMTAB_HH__