diff --git a/examples/php/composer.json b/examples/php/composer.json
index 9d900ebec1e..927f7df2ad3 100644
--- a/examples/php/composer.json
+++ b/examples/php/composer.json
@@ -7,7 +7,9 @@
   },
   "autoload": {
     "psr-4": {
-      "": "route_guide/"
+      "Routeguide\\": "route_guide/Routeguide/",
+      "GPBMetadata\\": ["GPBMetadata/","route_guide/GPBMetadata/"],
+      "Helloworld\\": "Helloworld/"
     }
   }
 }
diff --git a/examples/php/greeter_client.php b/examples/php/greeter_client.php
index bb94a085278..cae19a87ab1 100644
--- a/examples/php/greeter_client.php
+++ b/examples/php/greeter_client.php
@@ -21,11 +21,6 @@
 
 require dirname(__FILE__).'/vendor/autoload.php';
 
-@include_once dirname(__FILE__).'/Helloworld/GreeterClient.php';
-@include_once dirname(__FILE__).'/Helloworld/HelloReply.php';
-@include_once dirname(__FILE__).'/Helloworld/HelloRequest.php';
-@include_once dirname(__FILE__).'/GPBMetadata/Helloworld.php';
-
 function greet($name)
 {
     $client = new Helloworld\GreeterClient('localhost:50051', [