diff --git a/plugins/system/ps/cpu/cpu_freebsd.go b/plugins/system/ps/cpu/cpu_freebsd.go
index dc28dd6b6..11c22a2f4 100644
--- a/plugins/system/ps/cpu/cpu_freebsd.go
+++ b/plugins/system/ps/cpu/cpu_freebsd.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 // sys/resource.h
diff --git a/plugins/system/ps/cpu/cpu_linux.go b/plugins/system/ps/cpu/cpu_linux.go
index 2faca2dc1..2c9ff007e 100644
--- a/plugins/system/ps/cpu/cpu_linux.go
+++ b/plugins/system/ps/cpu/cpu_linux.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 func CPUTimes(percpu bool) ([]CPUTimesStat, error) {
diff --git a/plugins/system/ps/cpu/cpu_windows.go b/plugins/system/ps/cpu/cpu_windows.go
index c5f8c1d54..f9df31e1a 100644
--- a/plugins/system/ps/cpu/cpu_windows.go
+++ b/plugins/system/ps/cpu/cpu_windows.go
@@ -8,7 +8,7 @@ import (
 	"time"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 // TODO: Get percpu
diff --git a/plugins/system/ps/disk/disk_freebsd.go b/plugins/system/ps/disk/disk_freebsd.go
index 56aa14fa9..910ca7ae0 100644
--- a/plugins/system/ps/disk/disk_freebsd.go
+++ b/plugins/system/ps/disk/disk_freebsd.go
@@ -9,7 +9,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 const (
diff --git a/plugins/system/ps/disk/disk_linux.go b/plugins/system/ps/disk/disk_linux.go
index 2ec2fcb31..37b97fc4f 100644
--- a/plugins/system/ps/disk/disk_linux.go
+++ b/plugins/system/ps/disk/disk_linux.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 const (
diff --git a/plugins/system/ps/disk/disk_windows.go b/plugins/system/ps/disk/disk_windows.go
index b8de918e2..70d983962 100644
--- a/plugins/system/ps/disk/disk_windows.go
+++ b/plugins/system/ps/disk/disk_windows.go
@@ -9,7 +9,7 @@ import (
 	"time"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 var (
diff --git a/plugins/system/ps/host/host_darwin.go b/plugins/system/ps/host/host_darwin.go
index 1e6e3c6f5..bcbb773c5 100644
--- a/plugins/system/ps/host/host_darwin.go
+++ b/plugins/system/ps/host/host_darwin.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 func HostInfo() (*HostInfoStat, error) {
diff --git a/plugins/system/ps/host/host_freebsd.go b/plugins/system/ps/host/host_freebsd.go
index 5b955b42b..e2ca7e781 100644
--- a/plugins/system/ps/host/host_freebsd.go
+++ b/plugins/system/ps/host/host_freebsd.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 const (
diff --git a/plugins/system/ps/host/host_linux.go b/plugins/system/ps/host/host_linux.go
index 1a6926980..9aab8204c 100644
--- a/plugins/system/ps/host/host_linux.go
+++ b/plugins/system/ps/host/host_linux.go
@@ -14,7 +14,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 type LSB struct {
diff --git a/plugins/system/ps/host/host_windows.go b/plugins/system/ps/host/host_windows.go
index cfbdd69e5..97f310c98 100644
--- a/plugins/system/ps/host/host_windows.go
+++ b/plugins/system/ps/host/host_windows.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
-	common "github.com/shirou/gopsutil/common"
-	process "github.com/shirou/gopsutil/process"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
+	process "github.com/influxdb/tivan/plugins/system/ps/process"
 )
 
 var (
diff --git a/plugins/system/ps/load/load_darwin.go b/plugins/system/ps/load/load_darwin.go
index d90a42902..2de2df367 100644
--- a/plugins/system/ps/load/load_darwin.go
+++ b/plugins/system/ps/load/load_darwin.go
@@ -5,7 +5,7 @@ package load
 import (
 	"strconv"
 
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 func LoadAvg() (*LoadAvgStat, error) {
diff --git a/plugins/system/ps/load/load_freebsd.go b/plugins/system/ps/load/load_freebsd.go
index d82afbecc..770adca51 100644
--- a/plugins/system/ps/load/load_freebsd.go
+++ b/plugins/system/ps/load/load_freebsd.go
@@ -5,7 +5,7 @@ package load
 import (
 	"strconv"
 
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 func LoadAvg() (*LoadAvgStat, error) {
diff --git a/plugins/system/ps/load/load_windows.go b/plugins/system/ps/load/load_windows.go
index 70ad565d8..232fbcf10 100644
--- a/plugins/system/ps/load/load_windows.go
+++ b/plugins/system/ps/load/load_windows.go
@@ -3,7 +3,7 @@
 package load
 
 import (
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 func LoadAvg() (*LoadAvgStat, error) {
diff --git a/plugins/system/ps/mem/mem_darwin.go b/plugins/system/ps/mem/mem_darwin.go
index 6f901d254..37160bc5a 100644
--- a/plugins/system/ps/mem/mem_darwin.go
+++ b/plugins/system/ps/mem/mem_darwin.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 func getPageSize() (uint64, error) {
diff --git a/plugins/system/ps/mem/mem_freebsd.go b/plugins/system/ps/mem/mem_freebsd.go
index a380519f9..68bdb7b00 100644
--- a/plugins/system/ps/mem/mem_freebsd.go
+++ b/plugins/system/ps/mem/mem_freebsd.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 func VirtualMemory() (*VirtualMemoryStat, error) {
diff --git a/plugins/system/ps/mem/mem_linux.go b/plugins/system/ps/mem/mem_linux.go
index 00559c5a0..ab98b8651 100644
--- a/plugins/system/ps/mem/mem_linux.go
+++ b/plugins/system/ps/mem/mem_linux.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"syscall"
 
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 func VirtualMemory() (*VirtualMemoryStat, error) {
diff --git a/plugins/system/ps/mem/mem_windows.go b/plugins/system/ps/mem/mem_windows.go
index 985ab8fdf..d40bfd845 100644
--- a/plugins/system/ps/mem/mem_windows.go
+++ b/plugins/system/ps/mem/mem_windows.go
@@ -6,7 +6,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 var (
diff --git a/plugins/system/ps/net/net_darwin.go b/plugins/system/ps/net/net_darwin.go
index 2c4be7661..c6a392df0 100644
--- a/plugins/system/ps/net/net_darwin.go
+++ b/plugins/system/ps/net/net_darwin.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/common"
+	"github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 func NetIOCounters(pernic bool) ([]NetIOCountersStat, error) {
diff --git a/plugins/system/ps/net/net_freebsd.go b/plugins/system/ps/net/net_freebsd.go
index b9e14286b..15cc77daa 100644
--- a/plugins/system/ps/net/net_freebsd.go
+++ b/plugins/system/ps/net/net_freebsd.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/common"
+	"github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 func NetIOCounters(pernic bool) ([]NetIOCountersStat, error) {
diff --git a/plugins/system/ps/net/net_windows.go b/plugins/system/ps/net/net_windows.go
index 8937c4e89..57188f7e2 100644
--- a/plugins/system/ps/net/net_windows.go
+++ b/plugins/system/ps/net/net_windows.go
@@ -8,7 +8,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 var (
diff --git a/plugins/system/ps/process/process.go b/plugins/system/ps/process/process.go
index 7b4b877df..555bef7b8 100644
--- a/plugins/system/ps/process/process.go
+++ b/plugins/system/ps/process/process.go
@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"time"
 
-	cpu "github.com/shirou/gopsutil/cpu"
+	cpu "github.com/influxdb/tivan/plugins/system/ps/cpu"
 )
 
 type Process struct {
diff --git a/plugins/system/ps/process/process_darwin.go b/plugins/system/ps/process/process_darwin.go
index cd661c17a..5e118c62c 100644
--- a/plugins/system/ps/process/process_darwin.go
+++ b/plugins/system/ps/process/process_darwin.go
@@ -10,9 +10,9 @@ import (
 	"syscall"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
-	cpu "github.com/shirou/gopsutil/cpu"
-	net "github.com/shirou/gopsutil/net"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
+	cpu "github.com/influxdb/tivan/plugins/system/ps/cpu"
+	net "github.com/influxdb/tivan/plugins/system/ps/net"
 )
 
 // copied from sys/sysctl.h
diff --git a/plugins/system/ps/process/process_freebsd.go b/plugins/system/ps/process/process_freebsd.go
index 5fce20838..8c1a1ec64 100644
--- a/plugins/system/ps/process/process_freebsd.go
+++ b/plugins/system/ps/process/process_freebsd.go
@@ -7,9 +7,9 @@ import (
 	"encoding/binary"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
-	cpu "github.com/shirou/gopsutil/cpu"
-	net "github.com/shirou/gopsutil/net"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
+	cpu "github.com/influxdb/tivan/plugins/system/ps/cpu"
+	net "github.com/influxdb/tivan/plugins/system/ps/net"
 )
 
 // MemoryInfoExStat is different between OSes
diff --git a/plugins/system/ps/process/process_linux.go b/plugins/system/ps/process/process_linux.go
index b7bd4e527..41f3f10b6 100644
--- a/plugins/system/ps/process/process_linux.go
+++ b/plugins/system/ps/process/process_linux.go
@@ -11,10 +11,10 @@ import (
 	"strings"
 	"syscall"
 
-	common "github.com/shirou/gopsutil/common"
-	cpu "github.com/shirou/gopsutil/cpu"
-	host "github.com/shirou/gopsutil/host"
-	net "github.com/shirou/gopsutil/net"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
+	cpu "github.com/influxdb/tivan/plugins/system/ps/cpu"
+	host "github.com/influxdb/tivan/plugins/system/ps/host"
+	net "github.com/influxdb/tivan/plugins/system/ps/net"
 )
 
 const (
diff --git a/plugins/system/ps/process/process_test.go b/plugins/system/ps/process/process_test.go
index 884b61160..30bb3c840 100644
--- a/plugins/system/ps/process/process_test.go
+++ b/plugins/system/ps/process/process_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/shirou/gopsutil/common"
+	"github.com/influxdb/tivan/plugins/system/ps/common"
 )
 
 func testGetProcess() Process {
diff --git a/plugins/system/ps/process/process_windows.go b/plugins/system/ps/process/process_windows.go
index f31fe7795..831195640 100644
--- a/plugins/system/ps/process/process_windows.go
+++ b/plugins/system/ps/process/process_windows.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/shirou/w32"
 
-	common "github.com/shirou/gopsutil/common"
-	cpu "github.com/shirou/gopsutil/cpu"
-	net "github.com/shirou/gopsutil/net"
+	common "github.com/influxdb/tivan/plugins/system/ps/common"
+	cpu "github.com/influxdb/tivan/plugins/system/ps/cpu"
+	net "github.com/influxdb/tivan/plugins/system/ps/net"
 )
 
 const (