diff --git a/lldb/scripts/lldb.swig b/lldb/scripts/lldb.swig
index 4168f589a1d1..e100863f5faf 100644
--- a/lldb/scripts/lldb.swig
+++ b/lldb/scripts/lldb.swig
@@ -197,38 +197,42 @@ o SBLineEntry: Specifies an association with a contiguous range of instructions
 %include "lldb/lldb-forward-rtti.h"
 %include "lldb/lldb-types.h"
 
-%include "./Python/interface/SBAddress.i"
-%include "./Python/interface/SBBlock.i"
-%include "./Python/interface/SBBreakpoint.i"
-%include "./Python/interface/SBBreakpointLocation.i"
+/* Headers that are swigged directly. */
+%include "lldb/API/SBDefines.h"
 %include "lldb/API/SBBroadcaster.h"
 %include "lldb/API/SBCommandInterpreter.h"
 %include "lldb/API/SBCommandReturnObject.h"
 %include "lldb/API/SBCommunication.h"
-%include "./Python/interface/SBCompileUnit.i"
-%include "./Python/interface/SBDebugger.i"
 %include "lldb/API/SBError.h"
-%include "./Python/interface/SBEvent.i"
 %include "lldb/API/SBFileSpec.h"
-%include "./Python/interface/SBFrame.i"
-%include "./Python/interface/SBFunction.i"
 %include "lldb/API/SBHostOS.h"
 %include "lldb/API/SBInputReader.h"
 %include "lldb/API/SBInstruction.h"
 %include "lldb/API/SBInstructionList.h"
+%include "lldb/API/SBSourceManager.h"
+%include "lldb/API/SBStream.h"
+%include "lldb/API/SBStringList.h"
+%include "lldb/API/SBType.h"
+
+/* Python interface files with docstrings. */
+%include "./Python/interface/SBAddress.i"
+%include "./Python/interface/SBBlock.i"
+%include "./Python/interface/SBBreakpoint.i"
+%include "./Python/interface/SBBreakpointLocation.i"
+%include "./Python/interface/SBCompileUnit.i"
+%include "./Python/interface/SBDebugger.i"
+%include "./Python/interface/SBEvent.i"
+%include "./Python/interface/SBFrame.i"
+%include "./Python/interface/SBFunction.i"
 %include "./Python/interface/SBLineEntry.i"
 %include "./Python/interface/SBListener.i"
 %include "./Python/interface/SBModule.i"
 %include "./Python/interface/SBProcess.i"
-%include "lldb/API/SBSourceManager.h"
-%include "lldb/API/SBStream.h"
-%include "lldb/API/SBStringList.h"
 %include "./Python/interface/SBSymbol.i"
 %include "./Python/interface/SBSymbolContext.i"
 %include "./Python/interface/SBSymbolContextList.i"
 %include "./Python/interface/SBTarget.i"
 %include "./Python/interface/SBThread.i"
-%include "lldb/API/SBType.h"
 %include "./Python/interface/SBValue.i"
 %include "./Python/interface/SBValueList.i"