diff --git a/lldb/lib/Makefile b/lldb/lib/Makefile
index 26c98c8f440a..d79609d2f697 100644
--- a/lldb/lib/Makefile
+++ b/lldb/lib/Makefile
@@ -50,6 +50,7 @@ USEDLIBS = lldbAPI.a \
 	lldbPluginDynamicLoaderHexagon.a \
 	lldbPluginDynamicLoaderMacOSXDYLD.a \
 	lldbPluginDynamicLoaderWindowsDYLD.a \
+	lldbPluginExpressionParserClang.a \
 	lldbPluginInstructionARM.a \
 	lldbPluginInstructionARM64.a \
 	lldbPluginInstructionMIPS.a \
@@ -59,6 +60,9 @@ USEDLIBS = lldbAPI.a \
 	lldbPluginAppleObjCRuntime.a \
 	lldbPluginRenderScriptRuntime.a \
 	lldbPluginMemoryHistoryASan.a \
+	lldbPluginCPlusPlusLanguage.a \
+	lldbPluginObjCLanguage.a \
+	lldbPluginObjCPlusPlusLanguage.a \
 	lldbPluginObjectContainerBSDArchive.a \
 	lldbPluginObjectContainerMachOArchive.a \
 	lldbPluginObjectFileELF.a \
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/Makefile b/lldb/source/Plugins/ExpressionParser/Clang/Makefile
new file mode 100644
index 000000000000..eb592daabb48
--- /dev/null
+++ b/lldb/source/Plugins/ExpressionParser/Clang/Makefile
@@ -0,0 +1,14 @@
+##===- source/Plugins/ExpressionParser/Clang ---------------*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+
+LLDB_LEVEL := ../../../..
+LIBRARYNAME := lldbPluginExpressionParserClang
+BUILD_ARCHIVE = 1
+
+include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Plugins/Language/CPlusPlus/Makefile b/lldb/source/Plugins/Language/CPlusPlus/Makefile
new file mode 100644
index 000000000000..2cb0dcf638b3
--- /dev/null
+++ b/lldb/source/Plugins/Language/CPlusPlus/Makefile
@@ -0,0 +1,14 @@
+##===- source/Plugins/Language/CPlusPlus -------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+LLDB_LEVEL := ../../../..
+LIBRARYNAME := lldbPluginCPlusPlusLanguage
+BUILD_ARCHIVE = 1
+
+include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Plugins/Language/ObjC/Makefile b/lldb/source/Plugins/Language/ObjC/Makefile
new file mode 100644
index 000000000000..58c9e58f2bc6
--- /dev/null
+++ b/lldb/source/Plugins/Language/ObjC/Makefile
@@ -0,0 +1,14 @@
+##===- source/Plugins/Language/ObjC ------------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+LLDB_LEVEL := ../../../..
+LIBRARYNAME := lldbPluginObjCLanguage
+BUILD_ARCHIVE = 1
+
+include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Plugins/Language/ObjCPlusPlus/Makefile b/lldb/source/Plugins/Language/ObjCPlusPlus/Makefile
new file mode 100644
index 000000000000..74e1a14bcf4d
--- /dev/null
+++ b/lldb/source/Plugins/Language/ObjCPlusPlus/Makefile
@@ -0,0 +1,14 @@
+##===- source/Plugins/Language/ObjCPlusPlus ----------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+LLDB_LEVEL := ../../../..
+LIBRARYNAME := lldbPluginObjCPlusPlusLanguage
+BUILD_ARCHIVE = 1
+
+include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Plugins/Makefile b/lldb/source/Plugins/Makefile
index 858be7f1c71c..223a824998a9 100644
--- a/lldb/source/Plugins/Makefile
+++ b/lldb/source/Plugins/Makefile
@@ -24,10 +24,14 @@ PARALLEL_DIRS := ABI/MacOSX-arm ABI/MacOSX-arm64 ABI/MacOSX-i386 ABI/SysV-i386 A
 	LanguageRuntime/CPlusPlus/ItaniumABI \
 	LanguageRuntime/ObjC/AppleObjCRuntime \
 	LanguageRuntime/RenderScript/RenderScriptRuntime \
+	Language/CPlusPlus \
+	Language/ObjC \
+	Language/ObjCPlusPlus \
 	DynamicLoader/POSIX-DYLD \
 	DynamicLoader/Hexagon-DYLD \
 	DynamicLoader/MacOSX-DYLD \
 	DynamicLoader/Windows-DYLD \
+	ExpressionParser/Clang \
 	OperatingSystem/Python \
 	SystemRuntime/MacOSX \
 	SymbolVendor/ELF \