diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h
index 0681bbaf85..236bc61859 100644
--- a/include/wx/aui/auibar.h
+++ b/include/wx/aui/auibar.h
@@ -11,12 +11,14 @@
 
 
 
-#ifndef _WX_AUITOOLBAR_H_
-#define _WX_AUITOOLBAR_H_
+#ifndef _WX_AUIBAR_H_
+#define _WX_AUIBAR_H_
 
 
 #include "wx/defs.h"
 
+#if wxUSE_AUI
+
 
 enum wxAuiToolBarStyle
 {
@@ -615,6 +617,6 @@ typedef void (wxEvtHandler::*wxAuiToolBarEventFunction)(wxAuiToolBarEvent&);
 }
 #endif  // SWIG
 
-
-#endif  // __KCL_XMTOOLBAR_H
+#endif  // wxUSE_AUI
+#endif  // _WX_AUIBAR_H_
 
diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp
index 43e9950e00..a159c7b79c 100644
--- a/src/aui/auibar.cpp
+++ b/src/aui/auibar.cpp
@@ -24,9 +24,14 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_AUI
 
 #include "wx/statline.h"
 #include "wx/dcbuffer.h"
+#include "wx/sizer.h"
+#include "wx/image.h"
+#include "wx/settings.h"
+#include "wx/menu.h"
 
 #include "wx/aui/auibar.h"
 #include "wx/aui/framemanager.h"
@@ -2614,3 +2619,7 @@ void wxAuiToolBar::OnSetCursor(wxSetCursorEvent& evt)
     
     evt.SetCursor(cursor);
 }
+
+
+#endif // wxUSE_AUI
+