diff --git a/Source/ui_win32/ELFHeaderView.h b/Source/ui_win32/ELFHeaderView.h
index 1eff6abc..e29eaa57 100644
--- a/Source/ui_win32/ELFHeaderView.h
+++ b/Source/ui_win32/ELFHeaderView.h
@@ -1,5 +1,4 @@
-#ifndef _ELFHEADERVIEW_H_
-#define _ELFHEADERVIEW_H_
+#pragma once
 
 #include "win32/Dialog.h"
 #include "win32/Edit.h"
@@ -10,10 +9,10 @@ class CELFHeaderView : public Framework::Win32::CDialog
 {
 public:
 								CELFHeaderView(HWND, CELF*);
-								~CELFHeaderView();
+	virtual						~CELFHeaderView();
 
 protected:
-	long						OnSize(unsigned int, unsigned int, unsigned int);
+	long						OnSize(unsigned int, unsigned int, unsigned int) override;
 
 private:
 	void						FillInformation();
@@ -34,5 +33,3 @@ private:
 	Framework::Win32::CEdit*    m_pSHCount;
 	Framework::Win32::CEdit*    m_pSHStrTab;
 };
-
-#endif
\ No newline at end of file
diff --git a/Source/ui_win32/ELFProgramView.h b/Source/ui_win32/ELFProgramView.h
index bd67fc02..7bbe8426 100644
--- a/Source/ui_win32/ELFProgramView.h
+++ b/Source/ui_win32/ELFProgramView.h
@@ -1,5 +1,4 @@
-#ifndef _ELFPROGRAMVIEW_H_
-#define _ELFPROGRAMVIEW_H_
+#pragma once
 
 #include "win32/Dialog.h"
 #include "win32/Edit.h"
@@ -16,7 +15,7 @@ public:
 	void						SetProgramIndex(uint16);
 
 protected:
-	long						OnSize(unsigned int, unsigned int, unsigned int);
+	long						OnSize(unsigned int, unsigned int, unsigned int) override;
 
 private:
 	void						FillInformation();
@@ -35,5 +34,3 @@ private:
 	Framework::Win32::CEdit*	m_pFlags;
 	Framework::Win32::CEdit*	m_pAlign;
 };
-
-#endif
\ No newline at end of file
diff --git a/Source/ui_win32/ELFSectionView.h b/Source/ui_win32/ELFSectionView.h
index 5615c89b..102cbdc8 100644
--- a/Source/ui_win32/ELFSectionView.h
+++ b/Source/ui_win32/ELFSectionView.h
@@ -1,5 +1,4 @@
-#ifndef _ELFSECTIONVIEW_H_
-#define _ELFSECTIONVIEW_H_
+#pragma once
 
 #include "win32/Dialog.h"
 #include "win32/Edit.h"
@@ -19,8 +18,8 @@ public:
 	void							SetSectionIndex(uint16);
 
 protected:
-	long							OnSize(unsigned int, unsigned int, unsigned int);
-	long							OnSetFocus();
+	long							OnSize(unsigned int, unsigned int, unsigned int) override;
+	long							OnSetFocus() override;
 
 private:
 	void							RefreshLayout();
@@ -47,5 +46,3 @@ private:
 	CMemoryViewPtr*					m_memoryView;
 	Framework::Win32::CListView*	m_dynamicSectionListView;
 };
-
-#endif
diff --git a/Source/ui_win32/ELFSymbolView.h b/Source/ui_win32/ELFSymbolView.h
index bd498660..5b6614fa 100644
--- a/Source/ui_win32/ELFSymbolView.h
+++ b/Source/ui_win32/ELFSymbolView.h
@@ -1,5 +1,4 @@
-#ifndef _ELFSYMBOLVIEW_H_
-#define _ELFSYMBOLVIEW_H_
+#pragma once
 
 #include "win32/Window.h"
 #include "win32/ListView.h"
@@ -36,8 +35,8 @@ private:
 		SORT_STATE_ADDRESS_DESC,
 	};
 
-	long							OnSize(unsigned int, unsigned int, unsigned int);
-	long							OnNotify(WPARAM, NMHDR*);
+	long							OnSize(unsigned int, unsigned int, unsigned int) override;
+	long							OnNotify(WPARAM, NMHDR*) override;
 
 	static int						ItemNameComparer(const ITEM&, const ITEM&);
 	static int						ItemAddressComparer(const ITEM&, const ITEM&);
@@ -52,5 +51,3 @@ private:
 
 	SORT_STATE						m_sortState;
 };
-
-#endif
\ No newline at end of file
diff --git a/Source/ui_win32/ELFView.cpp b/Source/ui_win32/ELFView.cpp
index cea9f26b..53bb2aae 100644
--- a/Source/ui_win32/ELFView.cpp
+++ b/Source/ui_win32/ELFView.cpp
@@ -51,7 +51,7 @@ void CELFView::SetELF(CELF* pELF)
 	m_pHeaderView = new CELFHeaderView(hCont, m_pELF);
 	m_pSymbolView = new CELFSymbolView(hCont, m_pELF);
 
-    const ELFHEADER& header(m_pELF->GetHeader());
+	const ELFHEADER& header(m_pELF->GetHeader());
 
 	m_pSectionView = new CELFSectionView(hCont, m_pELF);
 	m_pProgramView = new CELFProgramView(hCont, m_pELF);
@@ -66,19 +66,19 @@ void CELFView::SetELF(CELF* pELF)
 
 void CELFView::PopulateList()
 {
-    InsertOption(NULL, _T("Header"), m_pHeaderView->m_hWnd);
+	InsertOption(NULL, _T("Header"), m_pHeaderView->m_hWnd);
 	HTREEITEM hItem = InsertOption(NULL, _T("Sections"), NULL);
-    const ELFHEADER& header = m_pELF->GetHeader();
+	const ELFHEADER& header = m_pELF->GetHeader();
 
 	const char* sStrTab = (const char*)m_pELF->GetSectionData(header.nSectHeaderStringTableIndex);
 	for(unsigned int i = 0; i < header.nSectHeaderCount; i++)
 	{
 		std::tstring sDisplay;
-    	const char* sName(NULL);
+		const char* sName(NULL);
 
-    	ELFSECTIONHEADER* pSect = m_pELF->GetSection(i);
+		ELFSECTIONHEADER* pSect = m_pELF->GetSection(i);
 		
-        if(sStrTab != NULL)
+		if(sStrTab != NULL)
 		{
 			sName = sStrTab + pSect->nStringTableIndex;
 		}
@@ -87,7 +87,7 @@ void CELFView::PopulateList()
 			sName = "";
 		}
 
-        if(strlen(sName))
+		if(strlen(sName))
 		{
 			sDisplay = string_cast<std::tstring>(sName);
 		}
@@ -96,7 +96,7 @@ void CELFView::PopulateList()
 			sDisplay = _T("Section ") + boost::lexical_cast<std::tstring>(i);
 		}
 
-        HTREEITEM sectionItem = InsertOption(hItem, sDisplay.c_str(), m_pSectionView->m_hWnd);
+		HTREEITEM sectionItem = InsertOption(hItem, sDisplay.c_str(), m_pSectionView->m_hWnd);
 		m_sectionItems[sectionItem] = i;
 	}
 	GetTreeView()->Expand(hItem, TVE_EXPAND);
diff --git a/Source/ui_win32/ELFView.h b/Source/ui_win32/ELFView.h
index 40db0d4d..03998856 100644
--- a/Source/ui_win32/ELFView.h
+++ b/Source/ui_win32/ELFView.h
@@ -1,5 +1,4 @@
-#ifndef _ELFVIEW_H_
-#define _ELFVIEW_H_
+#pragma once
 
 #include <unordered_map>
 #include "OptionWnd.h"
@@ -14,15 +13,17 @@ class CELFView : public COptionWnd<Framework::Win32::CMDIChild>
 {
 public:
 						CELFView(HWND);
-						~CELFView();
-	void				SetELF(CELF*);
-protected:
-	long				OnSysCommand(unsigned int, LPARAM);
+	virtual				~CELFView();
 
-	virtual void		OnItemAppearing(HTREEITEM);
+	void				SetELF(CELF*);
+
+protected:
+	long				OnSysCommand(unsigned int, LPARAM) override;
+
+	void				OnItemAppearing(HTREEITEM) override;
 
 private:
-	typedef std::tr1::unordered_map<HTREEITEM, int> SectionItemMap;
+	typedef std::unordered_map<HTREEITEM, int> SectionItemMap;
 
 	void				PopulateList();
 	void				Delete();
@@ -36,5 +37,3 @@ private:
 	SectionItemMap		m_sectionItems;
 	SectionItemMap		m_programItems;
 };
-
-#endif