Fix missing includes

The powershell one broke thanks to include hierarchy changes. The others
failed in the specs only for some reason.

Author: OJ

modules/payloads/singles/cmd/windows/powershell_bind_tcp.rb

@@ -4,6 +4,7 @@
 ##
 
 require 'msf/core'
+require 'msf/core/handler/bind_tcp'
 require 'msf/base/sessions/powershell'
 
 module Metasploit3
@@ -17,13 +18,11 @@ def initialize(info = {})
     super(merge_info(info,
       'Name'          => 'Windows Interactive Powershell Session, Bind TCP',
       'Description'   => 'Interacts with a powershell session on an established socket connection',
-      'Author'        =>
-        [
+      'Author'        => [
           'Ben Turner', # benpturner
           'Dave Hardy' # davehardy20
         ],
-      'References'    =>
-        [
+      'References'    => [
           ['URL', 'https://www.nettitude.co.uk/interactive-powershell-session-via-metasploit/']
         ],
       'License'       => MSF_LICENSE,
@@ -32,14 +31,9 @@ def initialize(info = {})
       'Handler'       => Msf::Handler::BindTcp,
       'Session'       => Msf::Sessions::PowerShell,
       'RequiredCmd'   => 'generic',
-      'Payload'       =>
-        {
-          'Offsets' => { },
-          'Payload' => ''
-        }
+      'Payload'       => { 'Payload' => '' }
       ))
-      register_options(
-      [
+      register_options( [
         OptString.new('LOAD_MODULES', [ false, "A list of powershell modules seperated by a comma to download over the web", nil ]),
       ], self.class)
   end
@@ -48,7 +42,9 @@ def generate
     lport = datastore['LPORT']
     lhost = datastore['LHOST']
 
-    template_path = ::File.join( Msf::Config.data_directory, 'exploits', 'powershell','powerfun.ps1')
+    template_path = ::File.join(Msf::Config.data_directory, 'exploits',
+                                'powershell','powerfun.ps1')
+
     script_in = ""
     ::File.open(template_path, "rb") do |fd|
       script_in << fd.read(fd.stat.size)

modules/payloads/singles/windows/meterpreter_bind_tcp.rb

@@ -9,6 +9,7 @@
 require 'msf/core/payload/windows/meterpreter_loader'
 require 'msf/base/sessions/meterpreter_x86_win'
 require 'msf/base/sessions/meterpreter_options'
+require 'rex/payloads/meterpreter/config'
 
 module Metasploit4
 

modules/payloads/singles/windows/meterpreter_reverse_http.rb

@@ -9,6 +9,7 @@
 require 'msf/core/payload/windows/meterpreter_loader'
 require 'msf/base/sessions/meterpreter_x86_win'
 require 'msf/base/sessions/meterpreter_options'
+require 'rex/payloads/meterpreter/config'
 
 module Metasploit4
 

modules/payloads/singles/windows/meterpreter_reverse_https.rb

@@ -9,6 +9,7 @@
 require 'msf/core/payload/windows/meterpreter_loader'
 require 'msf/base/sessions/meterpreter_x86_win'
 require 'msf/base/sessions/meterpreter_options'
+require 'rex/payloads/meterpreter/config'
 
 module Metasploit4
 

modules/payloads/singles/windows/meterpreter_reverse_ipv6_tcp.rb

@@ -9,6 +9,7 @@
 require 'msf/core/payload/windows/meterpreter_loader'
 require 'msf/base/sessions/meterpreter_x86_win'
 require 'msf/base/sessions/meterpreter_options'
+require 'rex/payloads/meterpreter/config'
 
 module Metasploit4
 

modules/payloads/singles/windows/meterpreter_reverse_tcp.rb

@@ -9,6 +9,7 @@
 require 'msf/core/payload/windows/meterpreter_loader'
 require 'msf/base/sessions/meterpreter_x86_win'
 require 'msf/base/sessions/meterpreter_options'
+require 'rex/payloads/meterpreter/config'
 
 module Metasploit3
 

modules/payloads/singles/windows/x64/meterpreter_bind_tcp.rb

@@ -9,6 +9,7 @@
 require 'msf/core/payload/windows/x64/meterpreter_loader'
 require 'msf/base/sessions/meterpreter_x64_win'
 require 'msf/base/sessions/meterpreter_options'
+require 'rex/payloads/meterpreter/config'
 
 module Metasploit4
 

modules/payloads/singles/windows/x64/meterpreter_reverse_http.rb

@@ -4,10 +4,12 @@
 ##
 
 require 'msf/core'
+require 'msf/core/transport_config'
 require 'msf/core/handler/reverse_http'
 require 'msf/core/payload/windows/x64/meterpreter_loader'
 require 'msf/base/sessions/meterpreter_x64_win'
 require 'msf/base/sessions/meterpreter_options'
+require 'rex/payloads/meterpreter/config'
 
 module Metasploit4
 

modules/payloads/singles/windows/x64/meterpreter_reverse_https.rb

@@ -9,6 +9,7 @@
 require 'msf/core/payload/windows/x64/meterpreter_loader'
 require 'msf/base/sessions/meterpreter_x64_win'
 require 'msf/base/sessions/meterpreter_options'
+require 'rex/payloads/meterpreter/config'
 
 module Metasploit4
 

modules/payloads/singles/windows/x64/meterpreter_reverse_ipv6_tcp.rb

@@ -9,6 +9,7 @@
 require 'msf/core/payload/windows/x64/meterpreter_loader'
 require 'msf/base/sessions/meterpreter_x64_win'
 require 'msf/base/sessions/meterpreter_options'
+require 'rex/payloads/meterpreter/config'
 
 module Metasploit4