diff --git a/src/DAlert.cpp b/src/DAlert.cpp
index a691759..bad8eff 100644
--- a/src/DAlert.cpp
+++ b/src/DAlert.cpp
@@ -62,6 +62,10 @@
 #define DEFAULT_RECT BRect(0, 0, 450, 75)
 #define max(LHS, RHS) ((LHS) > (RHS) ? (LHS) : (RHS))
 
+
+namespace CapitalBe {
+
+
 // Globals ---------------------------------------------------------------------
 static const unsigned int kAlertButtonMsg = 'ALTB';
 static const int kSemTimeOut = 50000;
@@ -715,3 +719,6 @@ _DAlertFilter_::Filter(BMessage* msg, BHandler** target)
 
 	return B_DISPATCH_MESSAGE;
 }
+
+
+}  // namespace CapitalBe
diff --git a/src/DAlert.h b/src/DAlert.h
index d96d0c7..1bb2b86 100644
--- a/src/DAlert.h
+++ b/src/DAlert.h
@@ -24,13 +24,12 @@
 //	Description:	DAlert displays a modal alert window.
 //------------------------------------------------------------------------------
 
-#ifndef _ALERT_H
-#define _ALERT_H
+#ifndef DALERT_H
+#define DALERT_H
 
 // Standard Includes -----------------------------------------------------------
 
 // System Includes -------------------------------------------------------------
-#include <Alert.h>
 #include <BeBuild.h>
 #include <Window.h>
 
@@ -47,6 +46,8 @@ class BButton;
 class BInvoker;
 class BTextView;
 
+namespace CapitalBe {
+
 // enum for flavors of alert ---------------------------------------------------
 enum alert_type {
 	B_EMPTY_ALERT = 0,
@@ -126,13 +127,20 @@ class DAlert : public BWindow {
 	uint32 _reserved[4];
 };
 
-//------------------------------------------------------------------------------
+}  // namespace CapitalBe
+
+using CapitalBe::alert_type;
+using CapitalBe::button_spacing;
+using CapitalBe::DAlert;
+using CapitalBe::alert_type::B_EMPTY_ALERT;
+using CapitalBe::alert_type::B_IDEA_ALERT;
+using CapitalBe::alert_type::B_INFO_ALERT;
+using CapitalBe::alert_type::B_STOP_ALERT;
+using CapitalBe::alert_type::B_WARNING_ALERT;
+using CapitalBe::button_spacing::B_EVEN_SPACING;
+using CapitalBe::button_spacing::B_OFFSET_SPACING;
 
-#endif	// _ALERT_H
 
-/*
- * $Log $
- *
- * $Id  $
- *
- */
+//------------------------------------------------------------------------------
+
+#endif	// DALERT_H