diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index cc6932d..3387aec 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1829,30 +1829,54 @@ cmQtAutoGenerators::SearchHeadersForCppFile(const std::string& absFilename,
   const std::string basename =
               cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename);
   const std::string absPath = cmsys::SystemTools::GetFilenamePath(
-                   cmsys::SystemTools::GetRealPath(absFilename.c_str())) + '/';
+                   cmsys::SystemTools::GetRealPath(absFilename.c_str()));
 
-  for(std::vector<std::string>::const_iterator ext = headerExtensions.begin();
-      ext != headerExtensions.end();
-      ++ext)
-    {
-    const std::string headerName = absPath + basename + "." + (*ext);
-    if (cmsys::SystemTools::FileExists(headerName.c_str()))
+  std::vector<std::string> incPaths;
+  incPaths.push_back(absPath);
+  cmSystemTools::ExpandListArgument(this->MocIncludesStr, incPaths);
+
+  for(std::vector<std::string>::const_iterator path = incPaths.begin();
+      path != incPaths.end();
+      ++path)
+  {
+    bool found = false;
+    for(std::vector<std::string>::const_iterator ext = headerExtensions.begin();
+        ext != headerExtensions.end();
+        ++ext)
+    {
+      const std::string headerName = (*path) + "/" + basename + "." + (*ext);
+          
+      if (cmsys::SystemTools::FileExists(headerName.c_str()))
       {
-      absHeaders.insert(headerName);
-      break;
+        absHeaders.insert(headerName);
+        found = true;
+        break;
       }
     }
-  for(std::vector<std::string>::const_iterator ext = headerExtensions.begin();
-      ext != headerExtensions.end();
-      ++ext)
-    {
-    const std::string privateHeaderName = absPath+basename+"_p."+(*ext);
-    if (cmsys::SystemTools::FileExists(privateHeaderName.c_str()))
-      {
-      absHeaders.insert(privateHeaderName);
+    if (found)
       break;
+  }
+  for(std::vector<std::string>::const_iterator path = incPaths.begin();
+      path != incPaths.end();
+      ++path)
+  {
+    bool found = false;
+    for(std::vector<std::string>::const_iterator ext = headerExtensions.begin();
+        ext != headerExtensions.end();
+        ++ext)
+    {
+      const std::string privateHeaderName = (*path) + "/" + basename + "_p." + (*ext);
+      
+      if (cmsys::SystemTools::FileExists(privateHeaderName.c_str()))
+      {
+        absHeaders.insert(privateHeaderName);
+        found = true;
+        break;
       }
     }
+    if (found)
+      break;
+  }
 
 }
 

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index d4d565c..ba56b3a 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1830,30 +1830,54 @@ cmQtAutoGenerators::SearchHeadersForCppFile(const std::string& absFilename,
   const std::string basename =
               cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename);
   const std::string absPath = cmsys::SystemTools::GetFilenamePath(
-                   cmsys::SystemTools::GetRealPath(absFilename.c_str())) + '/';
+                   cmsys::SystemTools::GetRealPath(absFilename.c_str()));
 
-  for(std::vector<std::string>::const_iterator ext = headerExtensions.begin();
-      ext != headerExtensions.end();
-      ++ext)
-    {
-    const std::string headerName = absPath + basename + "." + (*ext);
-    if (cmsys::SystemTools::FileExists(headerName.c_str()))
+  std::vector<std::string> incPaths;
+  incPaths.push_back(absPath);
+  cmSystemTools::ExpandListArgument(this->MocIncludesStr, incPaths);
+
+  for(std::vector<std::string>::const_iterator path = incPaths.begin();
+      path != incPaths.end();
+      ++path)
+  {
+    bool found = false;
+    for(std::vector<std::string>::const_iterator ext = headerExtensions.begin();
+        ext != headerExtensions.end();
+        ++ext)
+    {
+      const std::string headerName = (*path) + "/" + basename + "." + (*ext);
+          
+      if (cmsys::SystemTools::FileExists(headerName.c_str()))
       {
-      absHeaders.insert(headerName);
-      break;
+        absHeaders.insert(headerName);
+        found = true;
+        break;
       }
     }
-  for(std::vector<std::string>::const_iterator ext = headerExtensions.begin();
-      ext != headerExtensions.end();
-      ++ext)
-    {
-    const std::string privateHeaderName = absPath+basename+"_p."+(*ext);
-    if (cmsys::SystemTools::FileExists(privateHeaderName.c_str()))
-      {
-      absHeaders.insert(privateHeaderName);
+    if (found)
       break;
+  }
+  for(std::vector<std::string>::const_iterator path = incPaths.begin();
+      path != incPaths.end();
+      ++path)
+  {
+    bool found = false;
+    for(std::vector<std::string>::const_iterator ext = headerExtensions.begin();
+        ext != headerExtensions.end();
+        ++ext)
+    {
+      const std::string privateHeaderName = (*path) + "/" + basename + "_p." + (*ext);
+      
+      if (cmsys::SystemTools::FileExists(privateHeaderName.c_str()))
+      {
+        absHeaders.insert(privateHeaderName);
+        found = true;
+        break;
       }
     }
+    if (found)
+      break;
+  }
 
 }
 
diff --git a/Tests/Qt4And5Automoc/AnObject.cpp b/Tests/Qt4And5Automoc/AnObject.cpp
new file mode 100644
index 0000000..c5db2b2
--- /dev/null
+++ b/Tests/Qt4And5Automoc/AnObject.cpp
@@ -0,0 +1,5 @@
+#include "AnObject.h"
+
+void AnObject::activated() {
+}
+
diff --git a/Tests/Qt4And5Automoc/AnObject.h b/Tests/Qt4And5Automoc/AnObject.h
new file mode 100644
index 0000000..0fe85bf
--- /dev/null
+++ b/Tests/Qt4And5Automoc/AnObject.h
@@ -0,0 +1,10 @@
+#include <QObject>
+
+class AnObject : public QObject {
+  Q_OBJECT
+public:
+  AnObject() {}
+private slots:
+  void activated();
+};
+
diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt b/Tests/Qt4And5Automoc/CMakeLists.txt
index ad74961..7f3e81e 100644
--- a/Tests/Qt4And5Automoc/CMakeLists.txt
+++ b/Tests/Qt4And5Automoc/CMakeLists.txt
@@ -1,13 +1,13 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0.1)
 
 project(Qt4And5Automoc)
 
 if (QT_REVERSE_FIND_ORDER)
-  find_package(Qt5Core REQUIRED)
-  find_package(Qt4 REQUIRED)
+  find_package(Qt5Core)
+  find_package(Qt4)
 else()
-  find_package(Qt4 REQUIRED)
-  find_package(Qt5Core REQUIRED)
+  find_package(Qt4)
+  find_package(Qt5Core)
 endif()
 
 set(CMAKE_AUTOMOC ON)
@@ -20,10 +20,16 @@ macro(generate_main_file VERSION)
   )
 endmacro()
 
-generate_main_file(4)
-generate_main_file(5)
+include_directories(include)
 
-add_executable(qt4_exe "${CMAKE_CURRENT_BINARY_DIR}/main_qt4.cpp")
+if (${QT4_FOUND})
+generate_main_file(4)
+add_executable(qt4_exe "${CMAKE_CURRENT_BINARY_DIR}/main_qt4.cpp" AnObject.cpp src/OtherObject.cpp)
 target_link_libraries(qt4_exe Qt4::QtCore)
-add_executable(qt5_exe "${CMAKE_CURRENT_BINARY_DIR}/main_qt5.cpp")
+endif()
+
+if (${QT5_FOUND})
+generate_main_file(5)
+add_executable(qt5_exe "${CMAKE_CURRENT_BINARY_DIR}/main_qt5.cpp" AnObject.cpp src/OtherObject.cpp)
 target_link_libraries(qt5_exe Qt5::Core)
+endif()
diff --git a/Tests/Qt4And5Automoc/include/OtherObject.h b/Tests/Qt4And5Automoc/include/OtherObject.h
new file mode 100644
index 0000000..8019133
--- /dev/null
+++ b/Tests/Qt4And5Automoc/include/OtherObject.h
@@ -0,0 +1,10 @@
+#include <QObject>
+
+class OtherObject : public QObject {
+  Q_OBJECT
+public:
+  OtherObject() {}
+private slots:
+  void activated();
+};
+
diff --git a/Tests/Qt4And5Automoc/main.cpp.in b/Tests/Qt4And5Automoc/main.cpp.in
index 00fd641..7852cd6 100644
--- a/Tests/Qt4And5Automoc/main.cpp.in
+++ b/Tests/Qt4And5Automoc/main.cpp.in
@@ -1,5 +1,7 @@
 
 #include <QObject>
+#include "AnObject.h"
+#include "OtherObject.h"
 
 class SomeObject : public QObject
 {
@@ -14,5 +16,7 @@ public:
 
 int main(int argc, char **argv)
 {
+  AnObject a;
+  OtherObject o;
   return 0;
 }
diff --git a/Tests/Qt4And5Automoc/src/OtherObject.cpp b/Tests/Qt4And5Automoc/src/OtherObject.cpp
new file mode 100644
index 0000000..a9a4c82
--- /dev/null
+++ b/Tests/Qt4And5Automoc/src/OtherObject.cpp
@@ -0,0 +1,5 @@
+#include "OtherObject.h"
+
+void OtherObject::activated() {
+}
+

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index d4d565c..ba56b3a 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1830,30 +1830,54 @@ cmQtAutoGenerators::SearchHeadersForCppFile(const std::string& absFilename,
   const std::string basename =
               cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename);
   const std::string absPath = cmsys::SystemTools::GetFilenamePath(
-                   cmsys::SystemTools::GetRealPath(absFilename.c_str())) + '/';
+                   cmsys::SystemTools::GetRealPath(absFilename.c_str()));
 
-  for(std::vector<std::string>::const_iterator ext = headerExtensions.begin();
-      ext != headerExtensions.end();
-      ++ext)
-    {
-    const std::string headerName = absPath + basename + "." + (*ext);
-    if (cmsys::SystemTools::FileExists(headerName.c_str()))
+  std::vector<std::string> incPaths;
+  incPaths.push_back(absPath);
+  cmSystemTools::ExpandListArgument(this->MocIncludesStr, incPaths);
+
+  for(std::vector<std::string>::const_iterator path = incPaths.begin();
+      path != incPaths.end();
+      ++path)
+  {
+    bool found = false;
+    for(std::vector<std::string>::const_iterator ext = headerExtensions.begin();
+        ext != headerExtensions.end();
+        ++ext)
+    {
+      const std::string headerName = (*path) + "/" + basename + "." + (*ext);
+          
+      if (cmsys::SystemTools::FileExists(headerName.c_str()))
       {
-      absHeaders.insert(headerName);
-      break;
+        absHeaders.insert(headerName);
+        found = true;
+        break;
       }
     }
-  for(std::vector<std::string>::const_iterator ext = headerExtensions.begin();
-      ext != headerExtensions.end();
-      ++ext)
-    {
-    const std::string privateHeaderName = absPath+basename+"_p."+(*ext);
-    if (cmsys::SystemTools::FileExists(privateHeaderName.c_str()))
-      {
-      absHeaders.insert(privateHeaderName);
+    if (found)
       break;
+  }
+  for(std::vector<std::string>::const_iterator path = incPaths.begin();
+      path != incPaths.end();
+      ++path)
+  {
+    bool found = false;
+    for(std::vector<std::string>::const_iterator ext = headerExtensions.begin();
+        ext != headerExtensions.end();
+        ++ext)
+    {
+      const std::string privateHeaderName = (*path) + "/" + basename + "_p." + (*ext);
+      
+      if (cmsys::SystemTools::FileExists(privateHeaderName.c_str()))
+      {
+        absHeaders.insert(privateHeaderName);
+        found = true;
+        break;
       }
     }
+    if (found)
+      break;
+  }
 
 }
 
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 3973653..b5414cd 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -38,7 +38,7 @@ else()
 endif()
 
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR} inc)
 
 add_definitions(-DFOO -DSomeDefine="Barx")
 
@@ -71,7 +71,7 @@ if (CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]" AND NOT CMAKE_CONFIGURATION_
 endif()
 
 add_executable(QtAutogen main.cpp calwidget.cpp second_widget.cpp foo.cpp blub.cpp bar.cpp abc.cpp
-               xyz.cpp yaf.cpp gadget.cpp $<TARGET_OBJECTS:privateSlot>
+               xyz.cpp yaf.cpp gadget.cpp $<TARGET_OBJECTS:privateSlot> sub/other_object.cpp
                test.qrc second_resource.qrc resourcetester.cpp generated.cpp ${debug_srcs}
 )
 set_property(TARGET QtAutogen APPEND PROPERTY AUTOGEN_TARGET_DEPENDS generate_moc_input "${CMAKE_CURRENT_BINARY_DIR}/myotherinterface.h")
diff --git a/Tests/QtAutogen/inc/other_object.h b/Tests/QtAutogen/inc/other_object.h
new file mode 100644
index 0000000..a822b1e
--- /dev/null
+++ b/Tests/QtAutogen/inc/other_object.h
@@ -0,0 +1,11 @@
+#include <QObject>
+
+class OtherObject : public QObject {
+  Q_OBJECT
+public:
+  OtherObject() {}
+  void foo();
+signals:
+  void fooCalled();
+};
+
diff --git a/Tests/QtAutogen/main.cpp b/Tests/QtAutogen/main.cpp
index eb59665..85a36a4 100644
--- a/Tests/QtAutogen/main.cpp
+++ b/Tests/QtAutogen/main.cpp
@@ -51,6 +51,7 @@
 #include "yaf.h"
 #include "libC.h"
 #include "resourcetester.h"
+#include "inc/other_object.h"
 #ifdef TEST_DEBUG_CLASS
 #include "debug_class.h"
 #include <iostream>
@@ -82,6 +83,9 @@ int main(int argv, char **args)
   LibC lc;
   lc.foo();
 
+  OtherObject ow;
+  ow.foo();
+
   ResourceTester rt;
 
   QTimer::singleShot(0, &rt, SLOT(doTest()));
diff --git a/Tests/QtAutogen/sub/other_object.cpp b/Tests/QtAutogen/sub/other_object.cpp
new file mode 100644
index 0000000..6b1a305
--- /dev/null
+++ b/Tests/QtAutogen/sub/other_object.cpp
@@ -0,0 +1,8 @@
+#include "other_object.h"
+
+
+void OtherObject::foo()
+{
+  emit fooCalled();
+}
+