diff --git a/bindings/amplifier.swg b/bindings/amplifier.swg
index bc49490fb..962611feb 100644
--- a/bindings/amplifier.swg
+++ b/bindings/amplifier.swg
@@ -19,6 +19,12 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+%{
+#include <hamlib/amplifier.h>
+%}
+
+%include <hamlib/amplist.h>
+%include <hamlib/amplifier.h>
 
 %inline %{
 
diff --git a/bindings/hamlib.swg b/bindings/hamlib.swg
index e07dd0010..bdeb876bc 100644
--- a/bindings/hamlib.swg
+++ b/bindings/hamlib.swg
@@ -29,9 +29,6 @@
 
 #include <hamlib/config.h>
 
-#include <hamlib/rig.h>
-#include <hamlib/rotator.h>
-#include <hamlib/amplifier.h>
 //mdblack98 -- Commented this out -- is anybody using the functions in misc.h?
 //If so, then those functions should be moved to rig.h
 //#include "misc.h"
@@ -222,15 +219,6 @@
 
 %include <hamlib/rig_dll.h>
 
-%include <hamlib/riglist.h>
-%include <hamlib/rig.h>
-
-%include <hamlib/rotlist.h>
-%include <hamlib/rotator.h>
-
-%include <hamlib/amplist.h>
-%include <hamlib/amplifier.h>
-
 %inline {
 typedef const char * const_char_string;
 }
diff --git a/bindings/rig.swg b/bindings/rig.swg
index a101d1575..3f8692bfc 100644
--- a/bindings/rig.swg
+++ b/bindings/rig.swg
@@ -18,6 +18,12 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+%{
+#include <hamlib/rig.h>
+%}
+
+%include <hamlib/riglist.h>
+%include <hamlib/rig.h>
 
 %inline %{
 
diff --git a/bindings/rotator.swg b/bindings/rotator.swg
index 2e527fcef..90d07c281 100644
--- a/bindings/rotator.swg
+++ b/bindings/rotator.swg
@@ -18,6 +18,12 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+%{
+#include <hamlib/rotator.h>
+%}
+
+%include <hamlib/rotator.h>
+%include <hamlib/rotlist.h>
 
 %inline %{