inline void disableAllListeners() { ListenSocket::disableAll(); }
 %}
 
-%include "stdint.i"
-%include "std_string.i"
+%include <stdint.i>
+%include <std_string.i>
+
 %include "base/types.hh"
 
 void setOutputDir(const std::string &dir);
 
 #include "sim/debug.hh"
 %}
 
-%include "stdint.i"
+%include <stdint.i>
+
 %include "base/types.hh"
 %include "sim/debug.hh"
 
 %import "base/fast_alloc.hh"
 %import "sim/serialize.hh"
 
-%include "stdint.i"
-%include "std_string.i"
+%include <stdint.i>
+%include <std_string.i>
 
 %include "base/types.hh"
 %include "sim/eventq.hh"
 
 #include "base/inet.hh"
 %}
 
-%import "stdint.i"
-%import "std_string.i"
+%import <stdint.i>
+%import <std_string.i>
 
 namespace Net {
 struct EthAddr
 
 
 %module(package="m5.internal") random
 
-%include "stdint.i"
+%include <stdint.i>
 
 %{
 #include <cstdlib>
 
 #include "base/types.hh"
 %}
 
-%include "stdint.i"
-%include "base/types.hh"
+%include <stdint.i>
 
 %rename(assign) *::operator=;
 %include "base/range.hh"
+%include "base/types.hh"
 
 %template(AddrRange) Range<Addr>;
 %template(TickRange) Range<Tick>;
 
 %}
 
 // import these files for SWIG to wrap
-%include "stdint.i"
-%include "std_string.i"
+%include <stdint.i>
+%include <std_string.i>
 
 %include "base/types.hh"
 %include "sim/sim_object_params.hh"
 
 
 %module(package="m5.internal") stats
 
-%include "std_list.i"
-%include "std_string.i"
+%include <std_list.i>
+%include <std_string.i>
 
 %{
 #include "base/statistics.hh"