diff --git a/src/grovecircularled/javaupm_grovecircularled.i b/src/grovecircularled/javaupm_grovecircularled.i
new file mode 100644
index 00000000..85611481
--- /dev/null
+++ b/src/grovecircularled/javaupm_grovecircularled.i
@@ -0,0 +1,8 @@
+%module javaupm_grovecircularled
+%include "../upm.i"
+
+%{
+    #include "grovecircularled.h"
+%}
+
+%include "grovecircularled.h"
diff --git a/src/hp20x/javaupm_hp20x.i b/src/hp20x/javaupm_hp20x.i
new file mode 100644
index 00000000..73ac8bfa
--- /dev/null
+++ b/src/hp20x/javaupm_hp20x.i
@@ -0,0 +1,8 @@
+%module javaupm_hp20x
+%include "../upm.i"
+
+%{
+    #include "hp20x.h"
+%}
+
+%include "hp20x.h"
diff --git a/src/lcd/javaupm_i2clcd.i b/src/lcd/javaupm_i2clcd.i
index 2c076b75..98a9f0ba 100644
--- a/src/lcd/javaupm_i2clcd.i
+++ b/src/lcd/javaupm_i2clcd.i
@@ -10,9 +10,9 @@
     #include "ssd.h"
 %}
 
-%include "i2clcd.h"
+%include "lcd.h"
 %{
-    #include "i2clcd.h"
+    #include "lcd.h"
 %}
 
 %include "jhd1313m1.h"
@@ -34,3 +34,14 @@
 %{
     #include "ssd1308.h"
 %}
+
+%include "sainsmartks.h"
+%{
+    #include "sainsmartks.h"
+%}
+
+%include "hd44780_bits.h"
+%{
+        #include "hd44780_bits.h"
+%}
+
diff --git a/src/pn532/javaupm_pn532.i b/src/pn532/javaupm_pn532.i
new file mode 100644
index 00000000..4372f82b
--- /dev/null
+++ b/src/pn532/javaupm_pn532.i
@@ -0,0 +1,8 @@
+%module javaupm_pn532
+%include "../upm.i"
+
+%{
+    #include "pn532.h"
+%}
+
+%include "pn532.h"
diff --git a/src/rgbringcoder/javaupm_rgbringcoder.i b/src/rgbringcoder/javaupm_rgbringcoder.i
new file mode 100644
index 00000000..9db247e7
--- /dev/null
+++ b/src/rgbringcoder/javaupm_rgbringcoder.i
@@ -0,0 +1,8 @@
+%module javaupm_rgbringcoder
+%include "../upm.i"
+
+%{
+    #include "rgbringcoder.h"
+%}
+
+%include "rgbringcoder.h"