diff --git a/src/cpp/ripple/RegularKeySetTransactor.cpp b/src/cpp/ripple/RegularKeySetTransactor.cpp
index 0b88bc478..226ee7082 100644
--- a/src/cpp/ripple/RegularKeySetTransactor.cpp
+++ b/src/cpp/ripple/RegularKeySetTransactor.cpp
@@ -3,7 +3,7 @@
 
 SETUP_LOG();
 
-uint64_t RegularKeySetTransactor::calculateBaseFee()
+uint64 RegularKeySetTransactor::calculateBaseFee()
 {
 	if ( !(mTxnAccount->getFlags() & lsfPasswordSpent)
 		&& (mSigningPubKey.getAccountID() == mTxnAccountID))
diff --git a/src/cpp/ripple/RegularKeySetTransactor.h b/src/cpp/ripple/RegularKeySetTransactor.h
index 705a7dbfe..7d2fc53fe 100644
--- a/src/cpp/ripple/RegularKeySetTransactor.h
+++ b/src/cpp/ripple/RegularKeySetTransactor.h
@@ -2,7 +2,7 @@
 
 class RegularKeySetTransactor : public Transactor
 {
-	uint64_t calculateBaseFee();
+	uint64 calculateBaseFee();
 public:
 	RegularKeySetTransactor(const SerializedTransaction& txn,TransactionEngineParams params, TransactionEngine* engine) : Transactor(txn,params,engine) {}
 	TER checkFee();
diff --git a/src/cpp/ripple/Transactor.cpp b/src/cpp/ripple/Transactor.cpp
index a85d63f59..b9ace30fd 100644
--- a/src/cpp/ripple/Transactor.cpp
+++ b/src/cpp/ripple/Transactor.cpp
@@ -45,7 +45,7 @@ void Transactor::calculateFee()
 	mFeeDue	= STAmount(mEngine->getLedger()->scaleFeeLoad(calculateBaseFee()));
 }
 
-uint64_t Transactor::calculateBaseFee()
+uint64 Transactor::calculateBaseFee()
 {
 	return theConfig.FEE_DEFAULT;
 }
diff --git a/src/cpp/ripple/Transactor.h b/src/cpp/ripple/Transactor.h
index c61878634..bce4c4e36 100644
--- a/src/cpp/ripple/Transactor.h
+++ b/src/cpp/ripple/Transactor.h
@@ -27,7 +27,7 @@ protected:
 	void calculateFee();
 
 	// Returns the fee, not scaled for load (Should be in fee units. FIXME)
-	virtual uint64_t calculateBaseFee();
+	virtual uint64 calculateBaseFee();
 
 	virtual TER checkSig();
 	virtual TER doApply()=0;
diff --git a/src/cpp/ripple/uint256.h b/src/cpp/ripple/uint256.h
index eb74f0f5e..88048bb69 100644
--- a/src/cpp/ripple/uint256.h
+++ b/src/cpp/ripple/uint256.h
@@ -73,7 +73,7 @@ public:
 		zero();
 
 		// Put in least significant bits.
-		((uint64_t *) end())[-1] = htobe64(uHost);
+		((uint64*) end())[-1] = htobe64(uHost);
 
 		return *this;
 	}
@@ -438,7 +438,7 @@ public:
 		zero();
 
 		// Put in least significant bits.
-		((uint64_t *) end())[-1]	= htobe64(uHost);
+		((uint64*) end())[-1]	= htobe64(uHost);
 
 		return *this;
 	}
@@ -656,7 +656,7 @@ public:
 		zero();
 
 		// Put in least significant bits.
-		((uint64_t *) end())[-1]	= htobe64(uHost);
+		((uint64*) end())[-1]	= htobe64(uHost);
 
 		return *this;
 	}