diff --git a/headers/os/interface/OptionControl.h b/headers/os/interface/OptionControl.h
index 29a883e76a..e9cff8acc9 100644
--- a/headers/os/interface/OptionControl.h
+++ b/headers/os/interface/OptionControl.h
@@ -1,66 +1,68 @@
 /*
- * Copyright 2001-2007, Haiku, Inc. All Rights Reserved.
- * Distributed under the terms of the MIT License.
+ * Copyright 2001-2009, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT license.
  */
-
 #ifndef _OPTION_CONTROL_H
 #define _OPTION_CONTROL_H
 
+
 #include <Control.h>
 
+
 enum {
 	B_OPTION_CONTROL_VALUE = '_BMV'
 };
 
 
 class BOptionControl : public BControl {
-	public:
-		BOptionControl(BRect frame, const char *name, const char *label, 
-					BMessage *message,
-					uint32 resizeMask = B_FOLLOW_LEFT | B_FOLLOW_TOP,
-					uint32 flags = B_WILL_DRAW);
-		virtual ~BOptionControl();
+public:
+								BOptionControl(BRect frame, const char* name,
+									const char* label, BMessage* message,
+									uint32 resizeMask = B_FOLLOW_LEFT
+										| B_FOLLOW_TOP,
+									uint32 flags = B_WILL_DRAW);
+	virtual						~BOptionControl();
 
-		virtual	void		MessageReceived(BMessage *message);
+	virtual	void				MessageReceived(BMessage* message);
 
-		status_t		AddOption(const char *name, int32 value);
-		virtual	bool		GetOptionAt(int32 index, const char **outName,
-							int32 *outValue) = 0;
-		virtual	void		RemoveOptionAt(int32 index) = 0;
-		virtual	int32		CountOptions() const = 0;
-		virtual	status_t	AddOptionAt(const char *name, int32 value,
-								int32 index) = 0;
-		virtual	int32		SelectedOption(const char **name = 0,
-							int32 *outValue = 0) const = 0;
+			status_t			AddOption(const char* name, int32 value);
+	virtual	bool				GetOptionAt(int32 index, const char** _name,
+									int32* _value) = 0;
+	virtual	void				RemoveOptionAt(int32 index) = 0;
+	virtual	int32				CountOptions() const = 0;
+	virtual	status_t			AddOptionAt(const char* name, int32 value,
+									int32 index) = 0;
+	virtual	int32				SelectedOption(const char** name = NULL,
+									int32* outValue = NULL) const = 0;
 
-		virtual	status_t	SelectOptionFor(int32 value);
-		virtual	status_t	SelectOptionFor(const char *name);
+	virtual	status_t			SelectOptionFor(int32 value);
+	virtual	status_t			SelectOptionFor(const char* name);
 
-	protected:
-		BMessage*		MakeValueMessage(int32 value);
+protected:
+			BMessage*			MakeValueMessage(int32 value);
 
-	private:
-		BOptionControl();
-		BOptionControl(const BOptionControl &clone);
-		BOptionControl &operator=(const BOptionControl &clone);
+private:
+	// FBC padding and forbidden methods
+								BOptionControl();
+								BOptionControl(const BOptionControl& other);
+			BOptionControl&		operator=(const BOptionControl& other);
 
-		virtual		status_t _Reserved_OptionControl_0(void *, ...);
-		virtual		status_t _Reserved_OptionControl_1(void *, ...);
-		virtual		status_t _Reserved_OptionControl_2(void *, ...);
-		virtual		status_t _Reserved_OptionControl_3(void *, ...);
-		virtual		status_t _Reserved_OptionControl_4(void *, ...);
-		virtual		status_t _Reserved_OptionControl_5(void *, ...);
-		virtual		status_t _Reserved_OptionControl_6(void *, ...);
-		virtual		status_t _Reserved_OptionControl_7(void *, ...);
-		virtual		status_t _Reserved_OptionControl_8(void *, ...);
-		virtual		status_t _Reserved_OptionControl_9(void *, ...);
-		virtual		status_t _Reserved_OptionControl_10(void *, ...);
-		virtual		status_t _Reserved_OptionControl_11(void *, ...);
-	
-		uint32	_reserved_selection_control_[8];
+	virtual	status_t			_Reserved_OptionControl_0(void*, ...);
+	virtual	status_t			_Reserved_OptionControl_1(void*, ...);
+	virtual	status_t			_Reserved_OptionControl_2(void*, ...);
+	virtual	status_t			_Reserved_OptionControl_3(void*, ...);
+	virtual	status_t			_Reserved_OptionControl_4(void*, ...);
+	virtual	status_t			_Reserved_OptionControl_5(void*, ...);
+	virtual	status_t			_Reserved_OptionControl_6(void*, ...);
+	virtual	status_t			_Reserved_OptionControl_7(void*, ...);
+	virtual	status_t			_Reserved_OptionControl_8(void*, ...);
+	virtual	status_t			_Reserved_OptionControl_9(void*, ...);
+	virtual	status_t			_Reserved_OptionControl_10(void*, ...);
+	virtual	status_t			_Reserved_OptionControl_11(void*, ...);
 
+private:
+			uint32				_reserved[8];
 };
 
 
-#endif	/* _OPTION_CONTROL_H */
-
+#endif // _OPTION_CONTROL_H