4 files changed, 5 insertions, 6 deletions
diff --git a/cpu/beta_cpu/btb.cc b/cpu/beta_cpu/btb.cc
index 65b7fffa4..92864dbaa 100644
--- a/cpu/beta_cpu/btb.cc
+++ b/cpu/beta_cpu/btb.cc
@@ -26,8 +26,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <math.h>
-
+#include "base/intmath.hh"
 #include "base/trace.hh"
 #include "cpu/beta_cpu/btb.hh"
 
@@ -53,7 +52,7 @@ DefaultBTB::DefaultBTB(unsigned _numEntries,
 
     tagMask = (1 << tagBits) - 1;
 
-    tagShiftAmt = instShiftAmt + (int)log2(numEntries);
+    tagShiftAmt = instShiftAmt + FloorLog2(numEntries);
 }
 
 inline
diff --git a/cpu/beta_cpu/comm.hh b/cpu/beta_cpu/comm.hh
index 61660d39f..475ab8df8 100644
--- a/cpu/beta_cpu/comm.hh
+++ b/cpu/beta_cpu/comm.hh
@@ -29,11 +29,11 @@
 #ifndef __CPU_BETA_CPU_COMM_HH__
 #define __CPU_BETA_CPU_COMM_HH__
 
-#include <stdint.h>
 #include <vector>
 
 #include "arch/alpha/isa_traits.hh"
 #include "cpu/inst_seq.hh"
+#include "sim/host.hh"
 
 // Find better place to put this typedef.
 // The impl might be the best place for this.
diff --git a/cpu/beta_cpu/inst_queue.hh b/cpu/beta_cpu/inst_queue.hh
index 7d726c27f..02dc1222d 100644
--- a/cpu/beta_cpu/inst_queue.hh
+++ b/cpu/beta_cpu/inst_queue.hh
@@ -32,12 +32,12 @@
 #include <list>
 #include <map>
 #include <queue>
-#include <stdint.h>
 #include <vector>
 
 #include "base/statistics.hh"
 #include "base/timebuf.hh"
 #include "cpu/inst_seq.hh"
+#include "sim/host.hh"
 
 /**
  * A standard instruction queue class.  It holds ready instructions, in
diff --git a/cpu/beta_cpu/sat_counter.hh b/cpu/beta_cpu/sat_counter.hh
index 5b32774cc..5455ca56a 100644
--- a/cpu/beta_cpu/sat_counter.hh
+++ b/cpu/beta_cpu/sat_counter.hh
@@ -29,7 +29,7 @@
 #ifndef __CPU_BETA_CPU_SAT_COUNTER_HH__
 #define __CPU_BETA_CPU_SAT_COUNTER_HH__
 
-#include <stdint.h>
+#include "sim/host.hh"
 
 /**
  * Private counter class for the internal saturating counters.