diff --git a/lib/irb/cmd/chws.rb b/lib/irb/cmd/chws.rb
index e93c976f82..e9f257791c 100644
--- a/lib/irb/cmd/chws.rb
+++ b/lib/irb/cmd/chws.rb
@@ -10,8 +10,8 @@
 #
 #
 
-require "irb/cmd/nop.rb"
-require "irb/ext/change-ws.rb"
+require_relative "nop"
+require_relative "../ext/change-ws"
 
 # :stopdoc:
 module IRB
diff --git a/lib/irb/cmd/help.rb b/lib/irb/cmd/help.rb
index db2bd567e5..71590ee844 100644
--- a/lib/irb/cmd/help.rb
+++ b/lib/irb/cmd/help.rb
@@ -11,7 +11,7 @@
 
 require 'rdoc/ri/driver'
 
-require "irb/cmd/nop.rb"
+require_relative "nop"
 
 # :stopdoc:
 module IRB
diff --git a/lib/irb/cmd/load.rb b/lib/irb/cmd/load.rb
index 1bd3d3275a..b6769a4124 100644
--- a/lib/irb/cmd/load.rb
+++ b/lib/irb/cmd/load.rb
@@ -10,7 +10,7 @@
 #
 #
 
-require "irb/cmd/nop.rb"
+require_relative "nop"
 require_relative "../ext/loader"
 
 # :stopdoc:
diff --git a/lib/irb/cmd/pushws.rb b/lib/irb/cmd/pushws.rb
index ffe55abed6..187b276e48 100644
--- a/lib/irb/cmd/pushws.rb
+++ b/lib/irb/cmd/pushws.rb
@@ -10,8 +10,8 @@
 #
 #
 
-require "irb/cmd/nop.rb"
-require "irb/ext/workspaces.rb"
+require_relative "nop"
+require_relative "../ext/workspaces"
 
 # :stopdoc:
 module IRB
diff --git a/lib/irb/cmd/subirb.rb b/lib/irb/cmd/subirb.rb
index c1602f6e45..1e18607d1a 100644
--- a/lib/irb/cmd/subirb.rb
+++ b/lib/irb/cmd/subirb.rb
@@ -9,8 +9,8 @@
 #
 #
 
-require "irb/cmd/nop.rb"
-require "irb/ext/multi-irb"
+require_relative "nop"
+require_relative "../ext/multi-irb"
 
 # :stopdoc:
 module IRB
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
index 606d744e1e..e8e6a118e6 100644
--- a/lib/irb/context.rb
+++ b/lib/irb/context.rb
@@ -11,8 +11,8 @@
 #
 require_relative "workspace"
 require_relative "inspector"
-require "irb/input-method"
-require "irb/output-method"
+require_relative "input-method"
+require_relative "output-method"
 
 module IRB
   # A class that wraps the current state of the irb session, including the
diff --git a/lib/irb/help.rb b/lib/irb/help.rb
index a4264ab4ab..7868a70a6c 100644
--- a/lib/irb/help.rb
+++ b/lib/irb/help.rb
@@ -10,7 +10,7 @@
 #
 #
 
-require 'irb/magic-file'
+require_relative 'magic-file'
 
 module IRB
   # Outputs the irb help message, see IRB@Command+line+options.
diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb
index 7db602947b..f491d5a760 100644
--- a/lib/irb/input-method.rb
+++ b/lib/irb/input-method.rb
@@ -10,7 +10,7 @@
 #
 #
 require_relative 'src_encoding'
-require 'irb/magic-file'
+require_relative 'magic-file'
 
 module IRB
   STDIN_FILE_NAME = "(line)" # :nodoc:
diff --git a/lib/irb/notifier.rb b/lib/irb/notifier.rb
index a21e865f2e..5a68b0e8c8 100644
--- a/lib/irb/notifier.rb
+++ b/lib/irb/notifier.rb
@@ -11,7 +11,7 @@
 #
 
 require "e2mmap"
-require "irb/output-method"
+require_relative "output-method"
 
 module IRB
   # An output formatter used internally by the lexer.
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index 659b15f402..555d1f024f 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -12,7 +12,7 @@
 
 require "e2mmap"
 require_relative "slex"
-require "irb/ruby-token"
+require_relative "ruby-token"
 
 # :stopdoc:
 class RubyLex
diff --git a/lib/rss/rss.rb b/lib/rss/rss.rb
index 0eb08638d2..daaf6793b9 100644
--- a/lib/rss/rss.rb
+++ b/lib/rss/rss.rb
@@ -65,7 +65,7 @@ end
 require "English"
 require_relative "utils"
 require_relative "converter"
-require "rss/xml-stylesheet"
+require_relative "xml-stylesheet"
 
 module RSS
 
diff --git a/lib/shell/command-processor.rb b/lib/shell/command-processor.rb
index a6b55f5a89..00357e06fd 100644
--- a/lib/shell/command-processor.rb
+++ b/lib/shell/command-processor.rb
@@ -14,8 +14,8 @@ require "e2mmap"
 
 require_relative "error"
 require_relative "filter"
-require "shell/system-command"
-require "shell/builtin-command"
+require_relative "system-command"
+require_relative "builtin-command"
 
 class Shell
   # In order to execute a command on your OS, you need to define it as a
diff --git a/lib/unicode_normalize/normalize.rb b/lib/unicode_normalize/normalize.rb
index 460f784125..b27cdadaaa 100644
--- a/lib/unicode_normalize/normalize.rb
+++ b/lib/unicode_normalize/normalize.rb
@@ -18,7 +18,7 @@
 # content are purely an implementation detail, and should not be exposed in
 # any test or spec or otherwise.
 
-require 'unicode_normalize/tables.rb'
+require_relative 'tables'
 
 
 module UnicodeNormalize  # :nodoc:
diff --git a/lib/webrick/httpservlet/erbhandler.rb b/lib/webrick/httpservlet/erbhandler.rb
index aa02ce8a1d..cd09e5f216 100644
--- a/lib/webrick/httpservlet/erbhandler.rb
+++ b/lib/webrick/httpservlet/erbhandler.rb
@@ -9,7 +9,7 @@
 #
 # $IPR: erbhandler.rb,v 1.25 2003/02/24 19:25:31 gotoyuzo Exp $
 
-require 'webrick/httpservlet/abstract.rb'
+require_relative 'abstract'
 
 require 'erb'
 
diff --git a/lib/webrick/httpservlet/prochandler.rb b/lib/webrick/httpservlet/prochandler.rb
index c1f454e2f6..599ffc4340 100644
--- a/lib/webrick/httpservlet/prochandler.rb
+++ b/lib/webrick/httpservlet/prochandler.rb
@@ -9,7 +9,7 @@
 #
 # $IPR: prochandler.rb,v 1.7 2002/09/21 12:23:42 gotoyuzo Exp $
 
-require 'webrick/httpservlet/abstract.rb'
+require_relative 'abstract'
 
 module WEBrick
   module HTTPServlet