12 files changed, 18 insertions, 18 deletions
diff --git a/arts/runtime/CMakeLists.txt b/arts/runtime/CMakeLists.txt
index 794ec7f5..c36e1e11 100644
--- a/arts/runtime/CMakeLists.txt
+++ b/arts/runtime/CMakeLists.txt
@@ -31,18 +31,18 @@ add_definitions(
 
 tde_add_library( artsbuilder SHARED
   SOURCES
-    artsbuilder.cc sequenceutils.cc
-    structurebuilder_impl.cc structures_impl.cc moduleinfo.cc
-    compatibility.cc localfactory_impl.cc artsbuilderloader_impl.cc
+    artsbuilder.cpp sequenceutils.cpp
+    structurebuilder_impl.cpp structures_impl.cpp moduleinfo.cpp
+    compatibility.cpp localfactory_impl.cpp artsbuilderloader_impl.cpp
   VERSION 0.0.0
   LINK
-    mcop artsflow artsflow_idl ${DL_LIBRARIES} ${ARTS_LIBRARIES}
+    mcop artsflow artsflow_idl ${CMAKE_DL_LIBS} ${ARTS_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
 add_custom_command(
   OUTPUT
-    artsbuilder.cc artsbuilder.h
+    artsbuilder.cpp artsbuilder.h
     artsbuilder.mcoptype artsbuilder.mcopclass
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t
     -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/artsbuilder.idl
diff --git a/arts/runtime/Makefile.am b/arts/runtime/Makefile.am
index d97ad50b..5a883d83 100644
--- a/arts/runtime/Makefile.am
+++ b/arts/runtime/Makefile.am
@@ -7,9 +7,9 @@ INCLUDES= -I$(arts_includes) $(all_includes)
 
 lib_LTLIBRARIES = libartsbuilder.la
 
-libartsbuilder_la_SOURCES = artsbuilder.cc sequenceutils.cc \
-  structurebuilder_impl.cc structures_impl.cc moduleinfo.cc \
-  compatibility.cc localfactory_impl.cc artsbuilderloader_impl.cc
+libartsbuilder_la_SOURCES = artsbuilder.cpp sequenceutils.cpp \
+  structurebuilder_impl.cpp structures_impl.cpp moduleinfo.cpp \
+  compatibility.cpp localfactory_impl.cpp artsbuilderloader_impl.cpp
 
 libartsbuilder_la_LIBADD = -lmcop -lartsflow $(LIBDL) -lartsflow_idl
 libartsbuilder_la_COMPILE_FIRST = artsbuilder.h
@@ -19,10 +19,10 @@ libartsbuilder_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
 artsbuilder.lo: artsbuilder.h
 artsbuilder.mcopclass: artsbuilder.h
 artsbuilder.mcoptype: artsbuilder.h
-artsbuilder.h artsbuilder.cc: $(srcdir)/artsbuilder.idl $(MCOPIDL)
+artsbuilder.h artsbuilder.cpp: $(srcdir)/artsbuilder.idl $(MCOPIDL)
 	$(MCOPIDL) -t -I$(arts_includes) $(srcdir)/artsbuilder.idl
 
-DISTCLEANFILES = artsbuilder.cc artsbuilder.h \
+DISTCLEANFILES = artsbuilder.cpp artsbuilder.h \
   artsbuilder.mcoptype artsbuilder.mcopclass
 
 ####### install idl files
diff --git a/arts/runtime/artsbuilder.idl b/arts/runtime/artsbuilder.idl
index 42ff393a..4cc62329 100644
--- a/arts/runtime/artsbuilder.idl
+++ b/arts/runtime/artsbuilder.idl
@@ -1,5 +1,5 @@
 /*
- * DISCLAIMER: The interfaces in artsbuilder.idl (and the derived .cc/.h files)
+ * DISCLAIMER: The interfaces in artsbuilder.idl (and the derived .cpp/.h files)
  *             DO NOT GUARANTEE BINARY COMPATIBILITY YET.
  *
  * They are intended for developers. You shouldn't expect that applications in
diff --git a/arts/runtime/artsbuilderloader_impl.cc b/arts/runtime/artsbuilderloader_impl.cpp
index 238daae2..238daae2 100644
--- a/arts/runtime/artsbuilderloader_impl.cc
+++ b/arts/runtime/artsbuilderloader_impl.cpp
diff --git a/arts/runtime/compatibility.cc b/arts/runtime/compatibility.cpp
index 72bed765..72bed765 100644
--- a/arts/runtime/compatibility.cc
+++ b/arts/runtime/compatibility.cpp
diff --git a/arts/runtime/localfactory_impl.cc b/arts/runtime/localfactory_impl.cpp
index bf55271c..bf55271c 100644
--- a/arts/runtime/localfactory_impl.cc
+++ b/arts/runtime/localfactory_impl.cpp
diff --git a/arts/runtime/moduleinfo.cc b/arts/runtime/moduleinfo.cpp
index 7bef4464..7bef4464 100644
--- a/arts/runtime/moduleinfo.cc
+++ b/arts/runtime/moduleinfo.cpp
diff --git a/arts/runtime/moduleinfo.h b/arts/runtime/moduleinfo.h
index 7c1ff15f..11232c8b 100644
--- a/arts/runtime/moduleinfo.h
+++ b/arts/runtime/moduleinfo.h
@@ -28,6 +28,6 @@
 
 #include "artsbuilder.h"
 #include <tdelibs_export.h>
-KDE_EXPORT Arts::ModuleInfo makeModuleInfo(const std::string& name);
+TDE_EXPORT Arts::ModuleInfo makeModuleInfo(const std::string& name);
 
 #endif /* MODULEINFO_H */
diff --git a/arts/runtime/sequenceutils.cc b/arts/runtime/sequenceutils.cpp
index 335287d4..335287d4 100644
--- a/arts/runtime/sequenceutils.cc
+++ b/arts/runtime/sequenceutils.cpp
diff --git a/arts/runtime/sequenceutils.h b/arts/runtime/sequenceutils.h
index f156b8b7..bcae858d 100644
--- a/arts/runtime/sequenceutils.h
+++ b/arts/runtime/sequenceutils.h
@@ -26,16 +26,16 @@
 #include <string>
 #include <tdelibs_export.h>
 
-KDE_EXPORT int parse_line(const char *in, char *& cmd, char *& param);
+TDE_EXPORT int parse_line(const char *in, char *& cmd, char *& param);
 
-KDE_EXPORT void sqprintf(std::vector<std::string> *list, const char *fmt, ...)
+TDE_EXPORT void sqprintf(std::vector<std::string> *list, const char *fmt, ...)
 #ifdef __GNUC__
     __attribute__ (( format (printf, 2, 3)))
 #endif
 ;
-KDE_EXPORT void addSubStringSeq(std::vector<std::string> *target, const std::vector<std::string> *source);
-KDE_EXPORT void appendStringSeq(std::vector<std::string> *target, const std::vector<std::string> *source);
-KDE_EXPORT int parse_line(const std::string& in, std::string& cmd, std::string& param);
-KDE_EXPORT std::vector<std::string> *getSubStringSeq(const std::vector<std::string> *seq,unsigned long& i);
+TDE_EXPORT void addSubStringSeq(std::vector<std::string> *target, const std::vector<std::string> *source);
+TDE_EXPORT void appendStringSeq(std::vector<std::string> *target, const std::vector<std::string> *source);
+TDE_EXPORT int parse_line(const std::string& in, std::string& cmd, std::string& param);
+TDE_EXPORT std::vector<std::string> *getSubStringSeq(const std::vector<std::string> *seq,unsigned long& i);
 
 #endif /* ARTS_SEQUENCEUTILS_H */
diff --git a/arts/runtime/structurebuilder_impl.cc b/arts/runtime/structurebuilder_impl.cpp
index 43e5485c..43e5485c 100644
--- a/arts/runtime/structurebuilder_impl.cc
+++ b/arts/runtime/structurebuilder_impl.cpp
diff --git a/arts/runtime/structures_impl.cc b/arts/runtime/structures_impl.cpp
index 7c5a5e05..7c5a5e05 100644
--- a/arts/runtime/structures_impl.cc
+++ b/arts/runtime/structures_impl.cpp