diff --git a/src/bma250e/javaupm_bma250e.i b/src/bma250e/javaupm_bma250e.i
index daa85b12..b2009802 100644
--- a/src/bma250e/javaupm_bma250e.i
+++ b/src/bma250e/javaupm_bma250e.i
@@ -1,10 +1,12 @@
 %module javaupm_bma250e
 %include "../upm.i"
 %include "typemaps.i"
-%include "../upm_vectortypes.i"
+%include "std_vector.i"
 
 %ignore getAccelerometer(float *, float *, float *);
 
+%template(floatVector) std::vector<float>;
+
 %include "bma250e_defs.h"
 %include "bma250e.hpp"
 %{
diff --git a/src/bmg160/javaupm_bmg160.i b/src/bmg160/javaupm_bmg160.i
index 94cfa356..c404500a 100644
--- a/src/bmg160/javaupm_bmg160.i
+++ b/src/bmg160/javaupm_bmg160.i
@@ -1,10 +1,12 @@
 %module javaupm_bmg160
 %include "../upm.i"
 %include "typemaps.i"
-%include "../upm_vectortypes.i"
+%include "std_vector.i"
 
 %ignore getGyroscope(float *, float *, float *);
 
+%template(floatVector) std::vector<float>;
+
 %include "bmg160_defs.h"
 %include "bmg160.hpp"
 %{
diff --git a/src/bmm150/javaupm_bmm150.i b/src/bmm150/javaupm_bmm150.i
index d9d49b56..bb5d624f 100644
--- a/src/bmm150/javaupm_bmm150.i
+++ b/src/bmm150/javaupm_bmm150.i
@@ -1,10 +1,12 @@
 %module javaupm_bmm150
 %include "../upm.i"
 %include "typemaps.i"
-%include "../upm_vectortypes.i"
+%include "std_vector.i"
 
 %ignore getMagnetometer(float *, float *, float *);
 
+%template(floatVector) std::vector<float>;
+
 %include "bmm150_defs.h"
 %include "bmm150.hpp"
 %{
diff --git a/src/bmx055/javaupm_bmx055.i b/src/bmx055/javaupm_bmx055.i
index 09c1d374..ca065426 100644
--- a/src/bmx055/javaupm_bmx055.i
+++ b/src/bmx055/javaupm_bmx055.i
@@ -2,7 +2,7 @@
 %include "../upm.i"
 %include "cpointer.i"
 %include "typemaps.i"
-%include "../upm_vectortypes.i"
+%include "std_vector.i"
 
 %apply int {mraa::Edge};
 
@@ -10,6 +10,8 @@
 %ignore getMagnetometer(float *, float *, float *);
 %ignore getGyroscope(float *, float *, float *);
 
+%template(floatVector) std::vector<float>;
+
 %include "bmg160_defs.h"
 %include "bma250e_defs.h"
 %include "bmm150_defs.h"
diff --git a/src/bno055/javaupm_bno055.i b/src/bno055/javaupm_bno055.i
index 65ba3a59..4dba63ec 100644
--- a/src/bno055/javaupm_bno055.i
+++ b/src/bno055/javaupm_bno055.i
@@ -2,7 +2,8 @@
 %include "../upm.i"
 %include "cpointer.i"
 %include "typemaps.i"
-%include "../upm_vectortypes.i"
+%include "std_vector.i"
+%include "stdint.i"
 
 %ignore getCalibrationStatus(int *, int *, int *, int *);
 %ignore getAccelerometer(float *, float *, float *);
@@ -13,6 +14,10 @@
 %ignore getLinearAcceleration(float *, float *, float *);
 %ignore getGravityVectors(float *, float *, float *);
 
+%template(floatVector) std::vector<float>;
+%template(byteVector) std::vector<uint8_t>;
+%template(intVector) std::vector<int>;
+
 %include "bno055_regs.h"
 %include "bno055.hpp"
 %{
diff --git a/src/jhd1313m1/javaupm_jhd1313m1.i b/src/jhd1313m1/javaupm_jhd1313m1.i
index 00c0cc5b..b4cc23bc 100644
--- a/src/jhd1313m1/javaupm_jhd1313m1.i
+++ b/src/jhd1313m1/javaupm_jhd1313m1.i
@@ -1,7 +1,10 @@
 %module javaupm_jhd1313m1
 %include "../upm.i"
-%include "../upm_vectortypes.i"
 %include "typemaps.i"
+%include "std_vector.i"
+%include "stdint.i"
+
+%template(byteVector) std::vector<uint8_t>;
 
 %include "jhd1313m1.hpp"
 %{
diff --git a/src/lcdks/javaupm_lcdks.i b/src/lcdks/javaupm_lcdks.i
index 8632914a..d560eb1d 100644
--- a/src/lcdks/javaupm_lcdks.i
+++ b/src/lcdks/javaupm_lcdks.i
@@ -1,7 +1,10 @@
 %module javaupm_lcdks
 %include "../upm.i"
-%include "../upm_vectortypes.i"
 %include "typemaps.i"
+%include "std_vector.i"
+%include "stdint.i"
+
+%template(byteVector) std::vector<uint8_t>;
 
 %include "lcdks.hpp"
 %{
diff --git a/src/lcm1602/javaupm_lcm1602.i b/src/lcm1602/javaupm_lcm1602.i
index 6528b385..648d2dd4 100644
--- a/src/lcm1602/javaupm_lcm1602.i
+++ b/src/lcm1602/javaupm_lcm1602.i
@@ -1,7 +1,10 @@
 %module javaupm_lcm1602
 %include "../upm.i"
-%include "../upm_vectortypes.i"
 %include "typemaps.i"
+%include "std_vector.i"
+%include "stdint.i"
+
+%template(byteVector) std::vector<uint8_t>;
 
 %include "lcm1602.hpp"
 %{
diff --git a/src/lsm303agr/javaupm_lsm303agr.i b/src/lsm303agr/javaupm_lsm303agr.i
index 64eb37bd..22ec10ac 100644
--- a/src/lsm303agr/javaupm_lsm303agr.i
+++ b/src/lsm303agr/javaupm_lsm303agr.i
@@ -1,11 +1,13 @@
 %module javaupm_lsm303agr
 %include "../upm.i"
 %include "typemaps.i"
-%include "../upm_vectortypes.i"
+%include "std_vector.i"
 
 %ignore getMagnetometer(float *, float *, float *);
 %ignore getAccelerometer(float *, float *, float *);
 
+%template(floatVector) std::vector<float>;
+
 %include "lsm303agr_defs.h"
 %include "lsm303agr.hpp"
 %{
diff --git a/src/lsm303d/javaupm_lsm303d.i b/src/lsm303d/javaupm_lsm303d.i
index 474b3e99..f651ee87 100644
--- a/src/lsm303d/javaupm_lsm303d.i
+++ b/src/lsm303d/javaupm_lsm303d.i
@@ -1,11 +1,13 @@
 %module javaupm_lsm303d
 %include "../upm.i"
 %include "typemaps.i"
-%include "../upm_vectortypes.i"
+%include "std_vector.i"
 
 %ignore getMagnetometer(float *, float *, float *);
 %ignore getAccelerometer(float *, float *, float *);
 
+%template(floatVector) std::vector<float>;
+
 %include "lsm303d_defs.h"
 %include "lsm303d.hpp"
 %{