10 files changed, 23 insertions, 23 deletions
diff --git a/src/base/cmd/cmd.c b/src/base/cmd/cmd.c
index 35eb535a..6c8a3c2e 100644
--- a/src/base/cmd/cmd.c
+++ b/src/base/cmd/cmd.c
@@ -24,10 +24,10 @@
 #include <unistd.h>
 #endif
 
-#include "abc.h"
-#include "mainInt.h"
+#include "src/base/abc/abc.h"
+#include "src/base/main/mainInt.h"
 #include "cmdInt.h"
-#include "utilSignal.h"
+#include "src/misc/util/utilSignal.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/cmd/cmd.h b/src/base/cmd/cmd.h
index 740cf758..f424f090 100644
--- a/src/base/cmd/cmd.h
+++ b/src/base/cmd/cmd.h
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#ifndef __CMD_H__
-#define __CMD_H__
+#ifndef ABC__base__cmd__cmd_h
+#define ABC__base__cmd__cmd_h
 
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/base/cmd/cmdAlias.c b/src/base/cmd/cmdAlias.c
index 6078927d..67cdc318 100644
--- a/src/base/cmd/cmdAlias.c
+++ b/src/base/cmd/cmdAlias.c
@@ -18,7 +18,7 @@
 
 ***********************************************************************/
 
-#include "abc.h"
+#include "src/base/abc/abc.h"
 #include "cmdInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/base/cmd/cmdApi.c b/src/base/cmd/cmdApi.c
index 40c1dbf9..9357a93c 100644
--- a/src/base/cmd/cmdApi.c
+++ b/src/base/cmd/cmdApi.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "mainInt.h"
+#include "src/base/abc/abc.h"
+#include "src/base/main/mainInt.h"
 #include "cmdInt.h"
 
 ABC_NAMESPACE_IMPL_START
diff --git a/src/base/cmd/cmdFlag.c b/src/base/cmd/cmdFlag.c
index a220042b..7b46e8fc 100644
--- a/src/base/cmd/cmdFlag.c
+++ b/src/base/cmd/cmdFlag.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "mainInt.h"
+#include "src/base/abc/abc.h"
+#include "src/base/main/mainInt.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/cmd/cmdHist.c b/src/base/cmd/cmdHist.c
index a2f64027..b6a4d535 100644
--- a/src/base/cmd/cmdHist.c
+++ b/src/base/cmd/cmdHist.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "mainInt.h"
+#include "src/base/abc/abc.h"
+#include "src/base/main/mainInt.h"
 #include "cmd.h"
 #include "cmdInt.h"
 
diff --git a/src/base/cmd/cmdInt.h b/src/base/cmd/cmdInt.h
index 0ea9b364..6c1add92 100644
--- a/src/base/cmd/cmdInt.h
+++ b/src/base/cmd/cmdInt.h
@@ -18,15 +18,15 @@
 
 ***********************************************************************/
 
-#ifndef __CMD_INT_H__
-#define __CMD_INT_H__
+#ifndef ABC__base__cmd__cmdInt_h
+#define ABC__base__cmd__cmdInt_h
 
 
 ////////////////////////////////////////////////////////////////////////
 ///                          INCLUDES                                ///
 ////////////////////////////////////////////////////////////////////////
 
-#include "mainInt.h"
+#include "src/base/main/mainInt.h"
 #include "cmd.h"
 
 ABC_NAMESPACE_HEADER_START
diff --git a/src/base/cmd/cmdLoad.c b/src/base/cmd/cmdLoad.c
index 797275db..e4d8269a 100644
--- a/src/base/cmd/cmdLoad.c
+++ b/src/base/cmd/cmdLoad.c
@@ -18,11 +18,11 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "mainInt.h"
+#include "src/base/abc/abc.h"
+#include "src/base/main/mainInt.h"
 #include "cmd.h"
 #include "cmdInt.h"
-#include "utilSignal.h"
+#include "src/misc/util/utilSignal.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/cmd/cmdPlugin.c b/src/base/cmd/cmdPlugin.c
index 8649d465..84e89cb1 100644
--- a/src/base/cmd/cmdPlugin.c
+++ b/src/base/cmd/cmdPlugin.c
@@ -25,11 +25,11 @@
 #include <unistd.h>
 #endif
 
-#include "abc.h"
-#include "mainInt.h"
+#include "src/base/abc/abc.h"
+#include "src/base/main/mainInt.h"
 #include "cmd.h"
 #include "cmdInt.h"
-#include "utilSignal.h"
+#include "src/misc/util/utilSignal.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/base/cmd/cmdUtils.c b/src/base/cmd/cmdUtils.c
index 683d336e..e6dbed4e 100644
--- a/src/base/cmd/cmdUtils.c
+++ b/src/base/cmd/cmdUtils.c
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "abc.h"
-#include "mainInt.h"
+#include "src/base/abc/abc.h"
+#include "src/base/main/mainInt.h"
 #include "cmdInt.h"
 #include <ctype.h>