diff --git a/dtool/src/parser-inc/core.hpp b/dtool/src/parser-inc/opencv2/core/core.hpp
similarity index 100%
rename from dtool/src/parser-inc/core.hpp
rename to dtool/src/parser-inc/opencv2/core/core.hpp
diff --git a/dtool/src/parser-inc/highgui.hpp b/dtool/src/parser-inc/opencv2/highgui/highgui.hpp
similarity index 100%
rename from dtool/src/parser-inc/highgui.hpp
rename to dtool/src/parser-inc/opencv2/highgui/highgui.hpp
diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index 69d9d6171c..ab72d3d9de 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -2852,35 +2852,6 @@ if not PkgSkip("EIGEN") and GetTarget() == "windows" and GetThirdpartyDir():
 ########################################################################
 
 CopyTree(GetOutputDir()+'/include/parser-inc','dtool/src/parser-inc')
-MakeDirectory(GetOutputDir()+'/include/parser-inc/openssl')
-MakeDirectory(GetOutputDir()+'/include/parser-inc/netinet')
-MakeDirectory(GetOutputDir()+'/include/parser-inc/Cg')
-MakeDirectory(GetOutputDir()+'/include/parser-inc/Core')
-MakeDirectory(GetOutputDir()+'/include/parser-inc/Forest')
-MakeDirectory(GetOutputDir()+'/include/parser-inc/Renderers')
-MakeDirectory(GetOutputDir()+'/include/parser-inc/Renderers/OpenGL')
-MakeDirectory(GetOutputDir()+'/include/parser-inc/Renderers/DirectX9')
-MakeDirectory(GetOutputDir()+'/include/parser-inc/glew')
-MakeDirectory(GetOutputDir()+'/include/parser-inc/Eigen')
-MakeDirectory(GetOutputDir()+'/include/parser-inc/Rocket')
-MakeDirectory(GetOutputDir()+'/include/parser-inc/Rocket/Core')
-MakeDirectory(GetOutputDir()+'/include/parser-inc/opencv2')
-MakeDirectory(GetOutputDir()+'/include/parser-inc/opencv2/core')
-MakeDirectory(GetOutputDir()+'/include/parser-inc/opencv2/highgui')
-CopyAllFiles(GetOutputDir()+'/include/parser-inc/openssl/','dtool/src/parser-inc/')
-CopyAllFiles(GetOutputDir()+'/include/parser-inc/netinet/','dtool/src/parser-inc/')
-CopyFile(GetOutputDir()+'/include/parser-inc/Cg/','dtool/src/parser-inc/cg.h')
-CopyFile(GetOutputDir()+'/include/parser-inc/Cg/','dtool/src/parser-inc/cgGL.h')
-CopyFile(GetOutputDir()+'/include/parser-inc/Core/','dtool/src/parser-inc/Core.h')
-CopyFile(GetOutputDir()+'/include/parser-inc/Forest/','dtool/src/parser-inc/Forest.h')
-CopyFile(GetOutputDir()+'/include/parser-inc/Renderers/OpenGL/','dtool/src/parser-inc/OpenGLRenderer.h')
-CopyFile(GetOutputDir()+'/include/parser-inc/Renderers/DirectX9/','dtool/src/parser-inc/DirectX9Renderer.h')
-CopyFile(GetOutputDir()+'/include/parser-inc/glew/','dtool/src/parser-inc/glew.h')
-CopyFile(GetOutputDir()+'/include/parser-inc/Eigen/','dtool/src/parser-inc/Dense')
-CopyFile(GetOutputDir()+'/include/parser-inc/Eigen/','dtool/src/parser-inc/StdVector')
-CopyFile(GetOutputDir()+'/include/parser-inc/Rocket/Core/','dtool/src/parser-inc/RenderInterface.h')
-CopyFile(GetOutputDir()+'/include/parser-inc/opencv2/core/','dtool/src/parser-inc/core.hpp')
-CopyFile(GetOutputDir()+'/include/parser-inc/opencv2/highgui/','dtool/src/parser-inc/highgui.hpp')
 DeleteVCS(GetOutputDir()+'/include/parser-inc')
 
 ########################################################################