diff --git a/Targets/Bonito3a3000_7a/pci/ls7a_pci.c b/Targets/Bonito3a3000_7a/pci/ls7a_pci.c
index 19a666b7..658c12a2 100644
--- a/Targets/Bonito3a3000_7a/pci/ls7a_pci.c
+++ b/Targets/Bonito3a3000_7a/pci/ls7a_pci.c
@@ -14,7 +14,6 @@ typedef unsigned long device_t;
 #define HT_CONF_TYPE0_ADDR 0x90000efdfe000000
 #define HT_MAP_TYPE0_CONF_ADDR  BONITO_PCICFG0_BASE_VA
 
-typedef unsigned long long u64;
 extern struct pci_device *_pci_bus[16];
 extern int _max_pci_bus;
 
diff --git a/Targets/Bonito3a4000_7a/Bonito/tgt_machdep.c b/Targets/Bonito3a4000_7a/Bonito/tgt_machdep.c
index 2af5d969..c1d250cc 100644
--- a/Targets/Bonito3a4000_7a/Bonito/tgt_machdep.c
+++ b/Targets/Bonito3a4000_7a/Bonito/tgt_machdep.c
@@ -42,6 +42,7 @@
 #include <time.h>
 #include <stdlib.h>
 #include <dev/pci/pcivar.h>
+#include <linux/types.h>
 
 #include <autoconf.h>
 #include <pmon.h>
@@ -1656,7 +1657,6 @@ void ls_pcie_interrupt_fixup(void)
 }
 
 #define LOONGSON_HT1_INT_TRANS_ADDR 0x90000efdfb000270ULL
-typedef unsigned long long u64;
 u64  __raw__readq(u64 addr);
 u64 __raw__writeq(u64 addr, u64 val);
 void loongson_ht_trans_init(void)
diff --git a/Targets/Bonito3a780e/pci/rs780_cmn.c b/Targets/Bonito3a780e/pci/rs780_cmn.c
index e25dece4..8b445930 100644
--- a/Targets/Bonito3a780e/pci/rs780_cmn.c
+++ b/Targets/Bonito3a780e/pci/rs780_cmn.c
@@ -25,7 +25,6 @@
 #define HT_MAP_TYPE0_CONF_ADDR  BONITO_PCICFG0_BASE_VA
 
 
-typedef unsigned long long u64;
 u32 pci_read_type0_config32(u32 dev, u32 func, u32 reg){
     //u64 addr = 0x90000efdfe000000;
     u32 addr = HT_MAP_TYPE0_CONF_ADDR;
diff --git a/Targets/Bonito3a82w/pci/rs780_cmn.c b/Targets/Bonito3a82w/pci/rs780_cmn.c
index e25dece4..8b445930 100644
--- a/Targets/Bonito3a82w/pci/rs780_cmn.c
+++ b/Targets/Bonito3a82w/pci/rs780_cmn.c
@@ -25,7 +25,6 @@
 #define HT_MAP_TYPE0_CONF_ADDR  BONITO_PCICFG0_BASE_VA
 
 
-typedef unsigned long long u64;
 u32 pci_read_type0_config32(u32 dev, u32 func, u32 reg){
     //u64 addr = 0x90000efdfe000000;
     u32 addr = HT_MAP_TYPE0_CONF_ADDR;
diff --git a/Targets/Bonito3a84w/pci/rs780_cmn.c b/Targets/Bonito3a84w/pci/rs780_cmn.c
index e25dece4..8b445930 100644
--- a/Targets/Bonito3a84w/pci/rs780_cmn.c
+++ b/Targets/Bonito3a84w/pci/rs780_cmn.c
@@ -25,7 +25,6 @@
 #define HT_MAP_TYPE0_CONF_ADDR  BONITO_PCICFG0_BASE_VA
 
 
-typedef unsigned long long u64;
 u32 pci_read_type0_config32(u32 dev, u32 func, u32 reg){
     //u64 addr = 0x90000efdfe000000;
     u32 addr = HT_MAP_TYPE0_CONF_ADDR;
diff --git a/Targets/Bonito3a8780e/pci/rs780_cmn.c b/Targets/Bonito3a8780e/pci/rs780_cmn.c
index e25dece4..8b445930 100644
--- a/Targets/Bonito3a8780e/pci/rs780_cmn.c
+++ b/Targets/Bonito3a8780e/pci/rs780_cmn.c
@@ -25,7 +25,6 @@
 #define HT_MAP_TYPE0_CONF_ADDR  BONITO_PCICFG0_BASE_VA
 
 
-typedef unsigned long long u64;
 u32 pci_read_type0_config32(u32 dev, u32 func, u32 reg){
     //u64 addr = 0x90000efdfe000000;
     u32 addr = HT_MAP_TYPE0_CONF_ADDR;
diff --git a/Targets/Bonito3a94w/pci/rs780_cmn.c b/Targets/Bonito3a94w/pci/rs780_cmn.c
index e25dece4..8b445930 100644
--- a/Targets/Bonito3a94w/pci/rs780_cmn.c
+++ b/Targets/Bonito3a94w/pci/rs780_cmn.c
@@ -25,7 +25,6 @@
 #define HT_MAP_TYPE0_CONF_ADDR  BONITO_PCICFG0_BASE_VA
 
 
-typedef unsigned long long u64;
 u32 pci_read_type0_config32(u32 dev, u32 func, u32 reg){
     //u64 addr = 0x90000efdfe000000;
     u32 addr = HT_MAP_TYPE0_CONF_ADDR;
diff --git a/Targets/Bonito3adawning/pci/rs780_cmn.c b/Targets/Bonito3adawning/pci/rs780_cmn.c
index 634e019c..736b7245 100644
--- a/Targets/Bonito3adawning/pci/rs780_cmn.c
+++ b/Targets/Bonito3adawning/pci/rs780_cmn.c
@@ -25,7 +25,6 @@
 #define HT_MAP_TYPE0_CONF_ADDR  BONITO_PCICFG0_BASE_VA
 
 
-typedef unsigned long long u64;
 u32 pci_read_type0_config32(u32 dev, u32 func, u32 reg){
     //u64 addr = 0x90000efdfe000000;
     u32 addr = HT_MAP_TYPE0_CONF_ADDR;
diff --git a/Targets/Bonito3aserver/pci/rs780_cmn.c b/Targets/Bonito3aserver/pci/rs780_cmn.c
index e25dece4..8b445930 100644
--- a/Targets/Bonito3aserver/pci/rs780_cmn.c
+++ b/Targets/Bonito3aserver/pci/rs780_cmn.c
@@ -25,7 +25,6 @@
 #define HT_MAP_TYPE0_CONF_ADDR  BONITO_PCICFG0_BASE_VA
 
 
-typedef unsigned long long u64;
 u32 pci_read_type0_config32(u32 dev, u32 func, u32 reg){
     //u64 addr = 0x90000efdfe000000;
     u32 addr = HT_MAP_TYPE0_CONF_ADDR;
diff --git a/Targets/Bonito3asis/pci/rs780_cmn.c b/Targets/Bonito3asis/pci/rs780_cmn.c
index aefa0e08..905e7872 100644
--- a/Targets/Bonito3asis/pci/rs780_cmn.c
+++ b/Targets/Bonito3asis/pci/rs780_cmn.c
@@ -25,7 +25,6 @@
 #define HT_MAP_TYPE0_CONF_ADDR  BONITO_PCICFG0_BASE_VA
 
 
-typedef unsigned long long u64;
 u32 pci_read_type0_config32(u32 dev, u32 func, u32 reg){
     //u64 addr = 0x90000efdfe000000;
     u32 addr = HT_MAP_TYPE0_CONF_ADDR;
diff --git a/Targets/LS2K/ls2k/tgt_machdep.c b/Targets/LS2K/ls2k/tgt_machdep.c
index f3d95ca7..e4acc440 100644
--- a/Targets/LS2K/ls2k/tgt_machdep.c
+++ b/Targets/LS2K/ls2k/tgt_machdep.c
@@ -1971,7 +1971,6 @@ struct pci_config_data pci_config_array[] = {
 };
 
 int pci_config_array_size = ARRAY_SIZE(pci_config_array);
-typedef unsigned long long u64;
 u64  __raw__readq(u64 addr);
 u64 __raw__writeq(u64 addr, u64 val);
 void ls_pcie_config_set(void)
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 0095d171..bd635e6d 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -31,7 +31,6 @@ typedef unsigned char u8;
 typedef unsigned short u16;
 typedef unsigned int u32;
 #endif
-typedef unsigned long long u64;
 
 enum {
 	/* various global constants */
diff --git a/pmon/cmds/memtst.c b/pmon/cmds/memtst.c
index ca635352..42994dc2 100644
--- a/pmon/cmds/memtst.c
+++ b/pmon/cmds/memtst.c
@@ -38,13 +38,13 @@
 #undef _KERNEL
 #endif
 #include <sys/ioctl.h>
+#include <linux/types.h>
 
 #include <pmon.h>
 
 int cmd_memtst __P((int, char *[]));
 int cmd_spacescan __P((int, char *[]));
 static int do_mt __P((u_int32_t *, u_int32_t *, int));
-#define u64 unsigned long long
 extern u64 __raw__readq(u64 addr);
 extern u64 __raw__writeq(u64 addr, u64 val);
 
diff --git a/pmon/cmds/test/mem.c b/pmon/cmds/test/mem.c
index f53cc6bd..807da0db 100644
--- a/pmon/cmds/test/mem.c
+++ b/pmon/cmds/test/mem.c
@@ -1,11 +1,11 @@
 #include <stdio.h>
 #include <string.h>
+#include <linux/types.h>
 
 #ifdef LOONGSON_3A2H
 #define ADDR_ORIG 0x9000000004000000
 #define ADDR_TARGET 0x9000000005000000
 
-#define u64 unsigned long long 
 extern u64 __raw__writeq(u64 addr, u64 val);
 extern u64 __raw__readq(u64 q);
 
diff --git a/sys/dev/nand/ls2k-nand.c b/sys/dev/nand/ls2k-nand.c
index 2a1190ba..111b239f 100644
--- a/sys/dev/nand/ls2k-nand.c
+++ b/sys/dev/nand/ls2k-nand.c
@@ -95,7 +95,6 @@
 #define show_debug_msk(x,y) do{ if(show_data_debug) \
 	{printk(KERN_ERR "%s:\n",__func__);show_data(x,y);}}while(0)
 
-typedef unsigned long long u64;
 typedef unsigned long dma_addr_t;
 #define init_completion(...)
 #define dma_alloc_coherent(dev,size,handle,flag) _dma_alloc_coherent(size,handle)
diff --git a/sys/dev/pci/e1000e/hw.h b/sys/dev/pci/e1000e/hw.h
index 6f299c9f..f3f328b9 100644
--- a/sys/dev/pci/e1000e/hw.h
+++ b/sys/dev/pci/e1000e/hw.h
@@ -34,7 +34,6 @@
 #if 1 //zxj
 typedef unsigned int bool;
 typedef unsigned long long  __u64;
-typedef unsigned long long  u64;
 typedef unsigned int __u32;
 typedef unsigned short __u16;
 typedef signed int __s32;
diff --git a/sys/dev/pci/igb1/e1000_osdep.h b/sys/dev/pci/igb1/e1000_osdep.h
index 4b340e76..ee07d2ac 100644
--- a/sys/dev/pci/igb1/e1000_osdep.h
+++ b/sys/dev/pci/igb1/e1000_osdep.h
@@ -34,7 +34,6 @@
 #define udelay(us) delay(us)
 typedef unsigned int bool;
 typedef unsigned long long  __u64;
-typedef unsigned long long  u64;
 typedef unsigned int __u32;
 typedef unsigned short __u16;
 typedef signed int __s32;
diff --git a/sys/dev/pci/rtl8168.h b/sys/dev/pci/rtl8168.h
index 9db0887f..0044bcd6 100644
--- a/sys/dev/pci/rtl8168.h
+++ b/sys/dev/pci/rtl8168.h
@@ -244,8 +244,6 @@ enum effuse {
 #define RsvdMask	0x3fffc000
 
 
-typedef unsigned long long u64;
-
 struct TxDesc {
 	u32 opts1;
 	u32 opts2;
diff --git a/sys/dev/pci/rtl8169.c b/sys/dev/pci/rtl8169.c
index 4efc4cb5..b73889ef 100644
--- a/sys/dev/pci/rtl8169.c
+++ b/sys/dev/pci/rtl8169.c
@@ -246,7 +246,6 @@ static const int multicast_filter_limit = 32;
 static int if_in_attach;
 static int if_frequency;
 
-typedef unsigned long long u64;
 
 struct TxDesc {
 	u32 opts1;
diff --git a/sys/linux/types.h b/sys/linux/types.h
index 3bcf7724..7b347811 100644
--- a/sys/linux/types.h
+++ b/sys/linux/types.h
@@ -2,6 +2,7 @@
 
 #define __LINUX_TYPES_H_
 
+typedef unsigned long long u64;
 typedef unsigned char       u8;
 typedef unsigned short      u16;
 typedef unsigned int        u32;